diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Dockerfile | 5 | ||||
| -rw-r--r-- | README.md | 19 | ||||
| -rw-r--r-- | releases/7.2.0-container.yaml | 8 | ||||
| -rw-r--r-- | releases/8.0.0-container.yaml | 8 | ||||
| -rw-r--r-- | version.properties | 2 |
6 files changed, 37 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..485dee6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.idea @@ -1,4 +1,4 @@ -FROM adoptopenjdk/openjdk11:jre-11.0.8_10-alpine +FROM adoptopenjdk/openjdk11:jre-11.0.9.1_1-alpine LABEL maintainer="ONAP Integration team, morgan.richomme@orange.com" LABEL Description="Reference ONAP JAVA 11 image based on alpine" @@ -9,6 +9,9 @@ ENV JAVA_SEC_OPTS="" ARG user=onap ARG group=onap +# Install additional tools +RUN apk add --no-cache openssl + # Create a group and user RUN addgroup -S $group && adduser -G $group -D $user && \ mkdir /var/log/$user && \ @@ -1,12 +1,21 @@ # onap-java -This project aims to produce a reference ONAP baseline including JAVA 11. +This project aims to produce a reference ONAP baseline including JAVA 11 +following the seccom receommendations [1] ## versions +### 8.0.0 + +Update Java to 11.0.9 + +### 7.2.0 + +Added 'openssl' (OpenSSL 1.1.1g 21 Apr 2020) + ### 7.1.0 -It is based on adoptopenjdk/openjdk11:jre-11.0.8_10-alpine +It is based on adoptopenjdk/openjdk11:jre-11.0.8\_10-alpine Alpine images are GPLv3 free, which is required by the TSC. @@ -15,9 +24,11 @@ Alpine images are GPLv3 free, which is required by the TSC. It is based on the Debian image 11.0.6-jre-slim. When you create your docker from this docker you need to copy your jar file -under /opt/onap/app.jar. +under /app/app.jar. -You may sepecif 2 env variable to customize the way you are stating java: +You may specify two env variables to customize the way you are starting java: - ENV JAVA_OPTS: by default set to -Xms256m -Xmx1g - ENV JAVA_SEC_OPTS: empty by default + +[1]: https://git.onap.org/integration/seccom/tree/recommended_versions.yaml diff --git a/releases/7.2.0-container.yaml b/releases/7.2.0-container.yaml new file mode 100644 index 0000000..9b153aa --- /dev/null +++ b/releases/7.2.0-container.yaml @@ -0,0 +1,8 @@ +distribution_type: 'container' +container_release_tag: '7.2.0' +project: 'integration/docker/onap-java11' +log_dir: 'integration-docker-onap-java11-docker-merge-master/40/' +ref: beaaa274cf87fc7f45673c562cfcc31cb5d2e505 +containers: + - name: 'integration-java11' + version: 'latest' diff --git a/releases/8.0.0-container.yaml b/releases/8.0.0-container.yaml new file mode 100644 index 0000000..a1d2c3d --- /dev/null +++ b/releases/8.0.0-container.yaml @@ -0,0 +1,8 @@ +distribution_type: 'container' +container_release_tag: '8.0.0' +project: 'integration/docker/onap-java11' +log_dir: 'integration-docker-onap-java11-docker-merge-master/44/' +ref: b01f7fdbdc9257812e5912c49f2bb9fe06f9b21b +containers: + - name: 'integration-java11' + version: 'latest' diff --git a/version.properties b/version.properties index 0d3ec56..e1f94df 100644 --- a/version.properties +++ b/version.properties @@ -3,7 +3,7 @@ # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) # because they are used in Jenkins, whose plug-in doesn't support -major_version=7 +major_version=8 minor_version=0 patch_version=0 |