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 #5 from airdock-io/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
geronimo-iia committed Feb 7, 2016
2 parents f85d1c9 + a2f3cf4 commit cb336b7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ This repository contains **Dockerfile** for [Docker](https://www.docker.com/)'s
- [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-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: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-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')
Expand Down Expand Up @@ -47,7 +47,7 @@ Please note that a correct docker command should be something like this one (usi
CMD [ "gosu", "java:java", "/srv/java/jdk/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) :

```
Expand All @@ -63,7 +63,7 @@ If you using this script take care of your host sizing.
### 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
Expand Down
4 changes: 2 additions & 2 deletions src/generate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ generateReadMe() {
# special tag
readme="${readme} > [${FULLNAME}:latest](https://github.com/airdock-io/docker-oracle-jdk/tree/master/) (${LATEST_VERSION}) [![](https://badge.imagelayers.io/airdock/oracle-jdk:latest.svg)](https://imagelayers.io/?images=airdock/oracle-jdk:latest 'Get your own badge on imagelayers.io')${NL}${NL}"
readme="${readme} - [${FULLNAME}:1.8](https://github.com/airdock-io/docker-oracle-jdk/tree/master/jdk-1.8) (${TAG_JAVA_8}) [![](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')${NL}${NL}"
readme="${readme} - [${FULLNAME}:1.7](https://github.com/airdock-io/docker-oracle-jdk/tree/master/jdk-1.7) (${TAG_JAVA_8}) [![](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')${NL}${NL}${NL}"
readme="${readme} - [${FULLNAME}:1.7](https://github.com/airdock-io/docker-oracle-jdk/tree/master/jdk-1.7) (${TAG_JAVA_7}) [![](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')${NL}${NL}${NL}"
# Version
for supported_version in $VERSION_LIST; do
folder=$(basename $supported_version)
Expand Down Expand Up @@ -119,4 +119,4 @@ generateTag "jdk-1.7" ${TAG_JAVA_7}
# generate latest
generateLatest

clean
clean

0 comments on commit cb336b7

Please sign in to comment.