Skip to content
This repository has been archived by the owner on Feb 17, 2023. It is now read-only.

Commit

Permalink
Merge pull request #6 from airdock-io/develop
Browse files Browse the repository at this point in the history
add jre 1.7 and 1.8
  • Loading branch information
geronimo-iia committed Feb 8, 2016
2 parents cb336b7 + 292b4dc commit 23a6754
Show file tree
Hide file tree
Showing 100 changed files with 1,919 additions and 353 deletions.
12 changes: 5 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
# VERSION 1.1
# AUTHOR: Jerome Guibert <jguibert@gmail.com>
# DESCRIPTION: Oracle Java 8u66
# TO_BUILD: make build
# DESCRIPTION: Oracle Java jdk-8u66
# SOURCE: https://github.com/airdock-io/docker-oracle-jdk/tree/master/jdk-8u66

FROM airdock/base:latest
Expand All @@ -11,11 +8,12 @@ MAINTAINER Jerome Guibert <jguibert@gmail.com>
COPY java-dynamic-memory-opts /srv/java/

# Install Oracle JDK 8u66
RUN cd /srv/java && \
RUN cd /tmp && \
curl -L -O -H "Cookie: oraclelicense=accept-securebackup-cookie" -k "http://download.oracle.com/otn-pub/java/jdk/8u66-b17/jdk-8u66-linux-x64.tar.gz" && \
tar xvf jdk-8u66-linux-x64.tar.gz -C /srv/java && \
tar xf jdk-8u66-linux-x64.tar.gz -C /srv/java && \
rm -f jdk-8u66-linux-x64.tar.gz && \
ln -s /srv/java/jdk1.* /srv/java/jdk && \
ln -s /srv/java/jdk* /srv/java/jdk && \
ln -s /srv/java/%PREFIX /srv/java/jvm && \
chown -R java:java /srv/java && \
/root/post-install

Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
NAMESPACE = airdock
NAME = oracle-jdk
FULLNAME = $(NAMESPACE)/$(NAME)
VERSION = 8u66
VERSION = jdk-8u66

.PHONY: all clean build tag_latest release debug run save start usage

Expand Down Expand Up @@ -51,4 +51,4 @@ usage:
@echo "save: export this image"
@echo "run: launch this image with inner command"
@echo "start: start docker machine"
@echo "usage: this help"
@echo "usage: this help"
2 changes: 1 addition & 1 deletion README-short.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Oracle Java

Docker Image for Oracle Java SDK
Docker Image for Oracle Java SDK (JDK and JRE)
28 changes: 21 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Oracle Java [![](https://badge.imagelayers.io/airdock/oracle-jdk:latest.svg)](https://imagelayers.io/?images=airdock/oracle-jdk:latest 'Get your own badge on imagelayers.io')


Docker Image for Oracle Java SDK based on airdock/base:latest
Docker Image for Oracle Java SDK (JDK and JRE) based on airdock/base:latest

This repository contains **Dockerfile** for [Docker](https://www.docker.com/)'s [automated build](https://registry.hub.docker.com/u/airdock/) published to the public [Docker Hub Registry](https://registry.hub.docker.com/).

Expand All @@ -15,11 +15,16 @@ This repository contains **Dockerfile** for [Docker](https://www.docker.com/)'s

> [airdock/oracle-jdk:latest](https://github.com/airdock-io/docker-oracle-jdk/tree/master/) (jdk-8u66) [![](https://badge.imagelayers.io/airdock/oracle-jdk:latest.svg)](https://imagelayers.io/?images=airdock/oracle-jdk:latest 'Get your own badge on imagelayers.io')
###Latest tag per version and type
- [airdock/oracle-jdk:1.8](https://github.com/airdock-io/docker-oracle-jdk/tree/master/jdk-1.8) (jdk-8u66) [![](https://badge.imagelayers.io/airdock/oracle-jdk:1.8.svg)](https://imagelayers.io/?images=airdock/oracle-jdk:1.8 'Get your own badge on imagelayers.io')

- [airdock/oracle-jdk:1.7](https://github.com/airdock-io/docker-oracle-jdk/tree/master/jdk-1.7) (jdk-7u80) [![](https://badge.imagelayers.io/airdock/oracle-jdk:1.7.svg)](https://imagelayers.io/?images=airdock/oracle-jdk:1.7 'Get your own badge on imagelayers.io')
- [airdock/oracle-jdk:jdk-1.8](https://github.com/airdock-io/docker-oracle-jdk/tree/master/jdk-1.8) (jdk-8u66) [![](https://badge.imagelayers.io/airdock/oracle-jdk:jdk-1.8.svg)](https://imagelayers.io/?images=airdock/oracle-jdk:jdk-1.8 'Get your own badge on imagelayers.io')
- [airdock/oracle-jdk:jre-1.8](https://github.com/airdock-io/docker-oracle-jdk/tree/master/jre-1.8) (jre-8u66) [![](https://badge.imagelayers.io/airdock/oracle-jdk:jre-1.8.svg)](https://imagelayers.io/?images=airdock/oracle-jdk:jre-1.8 'Get your own badge on imagelayers.io')
- [airdock/oracle-jdk:1.7](https://github.com/airdock-io/docker-oracle-jdk/tree/master/jdk-1.7) (jdk-8u66) [![](https://badge.imagelayers.io/airdock/oracle-jdk:1.7.svg)](https://imagelayers.io/?images=airdock/oracle-jdk:1.7 'Get your own badge on imagelayers.io')
- [airdock/oracle-jdk:jdk-1.7](https://github.com/airdock-io/docker-oracle-jdk/tree/master/jdk-1.7) (jdk-7u80) [![](https://badge.imagelayers.io/airdock/oracle-jdk:jdk-1.7.svg)](https://imagelayers.io/?images=airdock/oracle-jdk:jdk-1.7 'Get your own badge on imagelayers.io')
- [airdock/oracle-jdk:jre-1.7](https://github.com/airdock-io/docker-oracle-jdk/tree/master/jre-1.7) (jre-7u80) [![](https://badge.imagelayers.io/airdock/oracle-jdk:jre-1.7.svg)](https://imagelayers.io/?images=airdock/oracle-jdk:jre-1.7 'Get your own badge on imagelayers.io')


###Specific version
- [airdock/oracle-jdk:jdk-8u66](https://github.com/airdock-io/docker-oracle-jdk/tree/master/jdk-8u66) [![](https://badge.imagelayers.io/airdock/oracle-jdk:jdk-8u66.svg)](https://imagelayers.io/?images=airdock/oracle-jdk:jdk-8u66 'Get your own badge on imagelayers.io')
- [airdock/oracle-jdk:jdk-8u65](https://github.com/airdock-io/docker-oracle-jdk/tree/master/jdk-8u65) [![](https://badge.imagelayers.io/airdock/oracle-jdk:jdk-8u65.svg)](https://imagelayers.io/?images=airdock/oracle-jdk:jdk-8u65 'Get your own badge on imagelayers.io')
- [airdock/oracle-jdk:jdk-8u60](https://github.com/airdock-io/docker-oracle-jdk/tree/master/jdk-8u60) [![](https://badge.imagelayers.io/airdock/oracle-jdk:jdk-8u60.svg)](https://imagelayers.io/?images=airdock/oracle-jdk:jdk-8u60 'Get your own badge on imagelayers.io')
Expand All @@ -30,6 +35,9 @@ This repository contains **Dockerfile** for [Docker](https://www.docker.com/)'s
- [airdock/oracle-jdk:jdk-8u25](https://github.com/airdock-io/docker-oracle-jdk/tree/master/jdk-8u25) [![](https://badge.imagelayers.io/airdock/oracle-jdk:jdk-8u25.svg)](https://imagelayers.io/?images=airdock/oracle-jdk:jdk-8u25 'Get your own badge on imagelayers.io')
- [airdock/oracle-jdk:jdk-7u80](https://github.com/airdock-io/docker-oracle-jdk/tree/master/jdk-7u80) [![](https://badge.imagelayers.io/airdock/oracle-jdk:jdk-7u80.svg)](https://imagelayers.io/?images=airdock/oracle-jdk:jdk-7u80 'Get your own badge on imagelayers.io')
- [airdock/oracle-jdk:jdk-7u79](https://github.com/airdock-io/docker-oracle-jdk/tree/master/jdk-7u79) [![](https://badge.imagelayers.io/airdock/oracle-jdk:jdk-7u79.svg)](https://imagelayers.io/?images=airdock/oracle-jdk:jdk-7u79 'Get your own badge on imagelayers.io')
- [airdock/oracle-jdk:jre-8u66](https://github.com/airdock-io/docker-oracle-jdk/tree/master/jre-8u66) [![](https://badge.imagelayers.io/airdock/oracle-jdk:jre-8u66.svg)](https://imagelayers.io/?images=airdock/oracle-jdk:jre-8u66 'Get your own badge on imagelayers.io')
- [airdock/oracle-jdk:jre-8u65](https://github.com/airdock-io/docker-oracle-jdk/tree/master/jre-8u65) [![](https://badge.imagelayers.io/airdock/oracle-jdk:jre-8u65.svg)](https://imagelayers.io/?images=airdock/oracle-jdk:jre-8u65 'Get your own badge on imagelayers.io')
- [airdock/oracle-jdk:jre-7u80](https://github.com/airdock-io/docker-oracle-jdk/tree/master/jre-7u80) [![](https://badge.imagelayers.io/airdock/oracle-jdk:jre-7u80.svg)](https://imagelayers.io/?images=airdock/oracle-jdk:jre-7u80 'Get your own badge on imagelayers.io')



Expand All @@ -44,29 +52,35 @@ Execute:
Please note that a correct docker command should be something like this one (using java user defined):

```
CMD [ "gosu", "java:java", "/srv/java/jdk/bin/java", ... ]
CMD [ "gosu", "java:java", "/srv/java/jvm/bin/java", ... ]
```

JVM uses only 1/4 of system memory by default, with script java-dynamic-memory-opts,
you could set a specific percent of memory (80 % per default) :

```
CMD [ "gosu", "java:java", "/srv/java/jdk/bin/java", "$(/srv/java/java-dynamic-memory-opts)", ... ]
CMD [ "gosu", "java:java", "/srv/java/jvm/bin/java", "$(/srv/java/java-dynamic-memory-opts)", ... ]
or
CMD [ "gosu", "java:java", "/srv/java/jdk/bin/java", "$(/srv/java/java-dynamic-memory-opts 90)", ... ]
CMD [ "gosu", "java:java", "/srv/java/jvm/bin/java", "$(/srv/java/java-dynamic-memory-opts 90)", ... ]
```
If you using this script take care of your host sizing.


## Change Log

### 1.2

- add JRE version
- JAVA HOME is bellow /srv/java/jdk or /srv/java/jre
- add shorlink /srv/java/jvm to simplify command line and absolute path

### 1.1

- add specific tag on SDK version
- add build process to generate all JDK version target
- add JAVA_HOME/bin in PATH, java-dynamic-memory-opts utility script for all version
- Use tarball from Oracle in order to install JDK
- JDK HOME is bellow /srv/java/jdk
- JAVA HOME is bellow /srv/java/jdk

### 1.0

Expand Down
12 changes: 5 additions & 7 deletions jdk-1.7/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
# VERSION 1.1
# AUTHOR: Jerome Guibert <jguibert@gmail.com>
# DESCRIPTION: Oracle Java 7u80
# TO_BUILD: make build
# DESCRIPTION: Oracle Java jdk-7u80
# SOURCE: https://github.com/airdock-io/docker-oracle-jdk/tree/master/jdk-7u80

FROM airdock/base:latest
Expand All @@ -11,11 +8,12 @@ MAINTAINER Jerome Guibert <jguibert@gmail.com>
COPY java-dynamic-memory-opts /srv/java/

# Install Oracle JDK 7u80
RUN cd /srv/java && \
RUN cd /tmp && \
curl -L -O -H "Cookie: oraclelicense=accept-securebackup-cookie" -k "http://download.oracle.com/otn-pub/java/jdk/7u80-b15/jdk-7u80-linux-x64.tar.gz" && \
tar xvf jdk-7u80-linux-x64.tar.gz -C /srv/java && \
tar xf jdk-7u80-linux-x64.tar.gz -C /srv/java && \
rm -f jdk-7u80-linux-x64.tar.gz && \
ln -s /srv/java/jdk1.* /srv/java/jdk && \
ln -s /srv/java/jdk* /srv/java/jdk && \
ln -s /srv/java/%PREFIX /srv/java/jvm && \
chown -R java:java /srv/java && \
/root/post-install

Expand Down
4 changes: 2 additions & 2 deletions jdk-1.7/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
NAMESPACE = airdock
NAME = oracle-jdk
FULLNAME = $(NAMESPACE)/$(NAME)
VERSION = 7u80
VERSION = jdk-7u80

.PHONY: all clean build tag_latest release debug run save start usage

Expand Down Expand Up @@ -51,4 +51,4 @@ usage:
@echo "save: export this image"
@echo "run: launch this image with inner command"
@echo "start: start docker machine"
@echo "usage: this help"
@echo "usage: this help"
2 changes: 1 addition & 1 deletion jdk-1.7/README-short.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Oracle Java

Docker Image for Oracle Java SDK
Docker Image for Oracle Java SDK (JDK and JRE)
30 changes: 22 additions & 8 deletions jdk-1.7/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Oracle Java [![](https://badge.imagelayers.io/airdock/oracle-jdk:latest.svg)](https://imagelayers.io/?images=airdock/oracle-jdk:latest 'Get your own badge on imagelayers.io')


Docker Image for Oracle Java SDK based on airdock/base:latest
Docker Image for Oracle Java SDK (JDK and JRE) based on airdock/base:latest

This repository contains **Dockerfile** for [Docker](https://www.docker.com/)'s [automated build](https://registry.hub.docker.com/u/airdock/) published to the public [Docker Hub Registry](https://registry.hub.docker.com/).

Expand All @@ -15,11 +15,16 @@ This repository contains **Dockerfile** for [Docker](https://www.docker.com/)'s

> [airdock/oracle-jdk:latest](https://github.com/airdock-io/docker-oracle-jdk/tree/master/) (jdk-8u66) [![](https://badge.imagelayers.io/airdock/oracle-jdk:latest.svg)](https://imagelayers.io/?images=airdock/oracle-jdk:latest 'Get your own badge on imagelayers.io')
###Latest tag per version and type
- [airdock/oracle-jdk:1.8](https://github.com/airdock-io/docker-oracle-jdk/tree/master/jdk-1.8) (jdk-8u66) [![](https://badge.imagelayers.io/airdock/oracle-jdk:1.8.svg)](https://imagelayers.io/?images=airdock/oracle-jdk:1.8 'Get your own badge on imagelayers.io')

- [airdock/oracle-jdk:jdk-1.8](https://github.com/airdock-io/docker-oracle-jdk/tree/master/jdk-1.8) (jdk-8u66) [![](https://badge.imagelayers.io/airdock/oracle-jdk:jdk-1.8.svg)](https://imagelayers.io/?images=airdock/oracle-jdk:jdk-1.8 'Get your own badge on imagelayers.io')
- [airdock/oracle-jdk:jre-1.8](https://github.com/airdock-io/docker-oracle-jdk/tree/master/jre-1.8) (jre-8u66) [![](https://badge.imagelayers.io/airdock/oracle-jdk:jre-1.8.svg)](https://imagelayers.io/?images=airdock/oracle-jdk:jre-1.8 'Get your own badge on imagelayers.io')
- [airdock/oracle-jdk:1.7](https://github.com/airdock-io/docker-oracle-jdk/tree/master/jdk-1.7) (jdk-8u66) [![](https://badge.imagelayers.io/airdock/oracle-jdk:1.7.svg)](https://imagelayers.io/?images=airdock/oracle-jdk:1.7 'Get your own badge on imagelayers.io')
- [airdock/oracle-jdk:jdk-1.7](https://github.com/airdock-io/docker-oracle-jdk/tree/master/jdk-1.7) (jdk-7u80) [![](https://badge.imagelayers.io/airdock/oracle-jdk:jdk-1.7.svg)](https://imagelayers.io/?images=airdock/oracle-jdk:jdk-1.7 'Get your own badge on imagelayers.io')
- [airdock/oracle-jdk:jre-1.7](https://github.com/airdock-io/docker-oracle-jdk/tree/master/jre-1.7) (jre-7u80) [![](https://badge.imagelayers.io/airdock/oracle-jdk:jre-1.7.svg)](https://imagelayers.io/?images=airdock/oracle-jdk:jre-1.7 'Get your own badge on imagelayers.io')


###Specific version
- [airdock/oracle-jdk:jdk-8u66](https://github.com/airdock-io/docker-oracle-jdk/tree/master/jdk-8u66) [![](https://badge.imagelayers.io/airdock/oracle-jdk:jdk-8u66.svg)](https://imagelayers.io/?images=airdock/oracle-jdk:jdk-8u66 'Get your own badge on imagelayers.io')
- [airdock/oracle-jdk:jdk-8u65](https://github.com/airdock-io/docker-oracle-jdk/tree/master/jdk-8u65) [![](https://badge.imagelayers.io/airdock/oracle-jdk:jdk-8u65.svg)](https://imagelayers.io/?images=airdock/oracle-jdk:jdk-8u65 'Get your own badge on imagelayers.io')
- [airdock/oracle-jdk:jdk-8u60](https://github.com/airdock-io/docker-oracle-jdk/tree/master/jdk-8u60) [![](https://badge.imagelayers.io/airdock/oracle-jdk:jdk-8u60.svg)](https://imagelayers.io/?images=airdock/oracle-jdk:jdk-8u60 'Get your own badge on imagelayers.io')
Expand All @@ -30,6 +35,9 @@ This repository contains **Dockerfile** for [Docker](https://www.docker.com/)'s
- [airdock/oracle-jdk:jdk-8u25](https://github.com/airdock-io/docker-oracle-jdk/tree/master/jdk-8u25) [![](https://badge.imagelayers.io/airdock/oracle-jdk:jdk-8u25.svg)](https://imagelayers.io/?images=airdock/oracle-jdk:jdk-8u25 'Get your own badge on imagelayers.io')
- [airdock/oracle-jdk:jdk-7u80](https://github.com/airdock-io/docker-oracle-jdk/tree/master/jdk-7u80) [![](https://badge.imagelayers.io/airdock/oracle-jdk:jdk-7u80.svg)](https://imagelayers.io/?images=airdock/oracle-jdk:jdk-7u80 'Get your own badge on imagelayers.io')
- [airdock/oracle-jdk:jdk-7u79](https://github.com/airdock-io/docker-oracle-jdk/tree/master/jdk-7u79) [![](https://badge.imagelayers.io/airdock/oracle-jdk:jdk-7u79.svg)](https://imagelayers.io/?images=airdock/oracle-jdk:jdk-7u79 'Get your own badge on imagelayers.io')
- [airdock/oracle-jdk:jre-8u66](https://github.com/airdock-io/docker-oracle-jdk/tree/master/jre-8u66) [![](https://badge.imagelayers.io/airdock/oracle-jdk:jre-8u66.svg)](https://imagelayers.io/?images=airdock/oracle-jdk:jre-8u66 'Get your own badge on imagelayers.io')
- [airdock/oracle-jdk:jre-8u65](https://github.com/airdock-io/docker-oracle-jdk/tree/master/jre-8u65) [![](https://badge.imagelayers.io/airdock/oracle-jdk:jre-8u65.svg)](https://imagelayers.io/?images=airdock/oracle-jdk:jre-8u65 'Get your own badge on imagelayers.io')
- [airdock/oracle-jdk:jre-7u80](https://github.com/airdock-io/docker-oracle-jdk/tree/master/jre-7u80) [![](https://badge.imagelayers.io/airdock/oracle-jdk:jre-7u80.svg)](https://imagelayers.io/?images=airdock/oracle-jdk:jre-7u80 'Get your own badge on imagelayers.io')



Expand All @@ -44,29 +52,35 @@ Execute:
Please note that a correct docker command should be something like this one (using java user defined):

```
CMD [ "gosu", "java:java", "/srv/java/jdk/bin/java", ... ]
CMD [ "gosu", "java:java", "/srv/java/jvm/bin/java", ... ]
```

JVM uses only 1/4 of system memory by default, with script java-dynamic-memory-opts,
JVM uses only 1/4 of system memory by default, with script java-dynamic-memory-opts,
you could set a specific percent of memory (80 % per default) :

```
CMD [ "gosu", "java:java", "/srv/java/jdk/bin/java", "$(/srv/java/java-dynamic-memory-opts)", ... ]
CMD [ "gosu", "java:java", "/srv/java/jvm/bin/java", "$(/srv/java/java-dynamic-memory-opts)", ... ]
or
CMD [ "gosu", "java:java", "/srv/java/jdk/bin/java", "$(/srv/java/java-dynamic-memory-opts 90)", ... ]
CMD [ "gosu", "java:java", "/srv/java/jvm/bin/java", "$(/srv/java/java-dynamic-memory-opts 90)", ... ]
```
If you using this script take care of your host sizing.


## Change Log

### 1.2

- add JRE version
- JAVA HOME is bellow /srv/java/jdk or /srv/java/jre
- add shorlink /srv/java/jvm to simplify command line and absolute path

### 1.1

- add specific tag on SDK version
- add build process to generate all JDK version target
- add build process to generate all JDK version target
- add JAVA_HOME/bin in PATH, java-dynamic-memory-opts utility script for all version
- Use tarball from Oracle in order to install JDK
- JDK HOME is bellow /srv/java/jdk
- JAVA HOME is bellow /srv/java/jdk

### 1.0

Expand Down
12 changes: 5 additions & 7 deletions jdk-1.8/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
# VERSION 1.1
# AUTHOR: Jerome Guibert <jguibert@gmail.com>
# DESCRIPTION: Oracle Java 8u66
# TO_BUILD: make build
# DESCRIPTION: Oracle Java jdk-8u66
# SOURCE: https://github.com/airdock-io/docker-oracle-jdk/tree/master/jdk-8u66

FROM airdock/base:latest
Expand All @@ -11,11 +8,12 @@ MAINTAINER Jerome Guibert <jguibert@gmail.com>
COPY java-dynamic-memory-opts /srv/java/

# Install Oracle JDK 8u66
RUN cd /srv/java && \
RUN cd /tmp && \
curl -L -O -H "Cookie: oraclelicense=accept-securebackup-cookie" -k "http://download.oracle.com/otn-pub/java/jdk/8u66-b17/jdk-8u66-linux-x64.tar.gz" && \
tar xvf jdk-8u66-linux-x64.tar.gz -C /srv/java && \
tar xf jdk-8u66-linux-x64.tar.gz -C /srv/java && \
rm -f jdk-8u66-linux-x64.tar.gz && \
ln -s /srv/java/jdk1.* /srv/java/jdk && \
ln -s /srv/java/jdk* /srv/java/jdk && \
ln -s /srv/java/%PREFIX /srv/java/jvm && \
chown -R java:java /srv/java && \
/root/post-install

Expand Down
4 changes: 2 additions & 2 deletions jdk-1.8/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
NAMESPACE = airdock
NAME = oracle-jdk
FULLNAME = $(NAMESPACE)/$(NAME)
VERSION = 8u66
VERSION = jdk-8u66

.PHONY: all clean build tag_latest release debug run save start usage

Expand Down Expand Up @@ -51,4 +51,4 @@ usage:
@echo "save: export this image"
@echo "run: launch this image with inner command"
@echo "start: start docker machine"
@echo "usage: this help"
@echo "usage: this help"
2 changes: 1 addition & 1 deletion jdk-1.8/README-short.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Oracle Java

Docker Image for Oracle Java SDK
Docker Image for Oracle Java SDK (JDK and JRE)
Loading

0 comments on commit 23a6754

Please sign in to comment.