diff options
| author |   Bogumil Zebek <bogumil.zebek@nokia.com> | 2020-08-21 08:37:36 +0200 |
|---|---|---|
| committer | Zebek Bogumil <bogumil.zebek@nokia.com> | 2020-08-21 08:37:36 +0200 |
| commit | 0aa56e61319ae87adadd95e419f7cea12474b2ed (patch) | |
| tree | 59745c04a47a21fc186968bb7678161b60029335 /vnfmarket-be/deployment/docker | |
| parent | 87abb288ba1e107fb75148effd967420b6c76148 (diff) | |
Migrate from java 8 to java 11
- update Dockerfile
- update documentation
Issue-ID: VNFSDK-632
Signed-off-by: Zebek Bogumil <bogumil.zebek@nokia.com>
Change-Id: Ibdd8a17de96e58bc86ed79b8a7e8fa4f3fa2919d
Diffstat (limited to 'vnfmarket-be/deployment/docker')
| -rw-r--r-- | vnfmarket-be/deployment/docker/docker-refrepo/pom.xml | 14 | ||||
| -rw-r--r-- | vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/Dockerfile | 9 |
2 files changed, 18 insertions, 5 deletions
diff --git a/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml b/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml index 23274d4d..745b6fa0 100644 --- a/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml +++ b/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Copyright 2017 Huawei Technologies Co., Ltd. + Copyright 2020 Nokia Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -68,7 +69,18 @@ </resource> </resources> </configuration> - + <dependencies> + <dependency> + <groupId>javax.activation</groupId> + <artifactId>javax.activation-api</artifactId> + <version>${javax.activation-api.version}</version> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-api.version}</version> + </dependency> + </dependencies> <executions> <execution> <id>build-image</id> diff --git a/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/Dockerfile b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/Dockerfile index 65812d67..f2388977 100644 --- a/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/Dockerfile +++ b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/Dockerfile @@ -1,4 +1,5 @@ # Copyright 2020 Huawei Technologies Co., Ltd. +# Copyright 2020 Nokia # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -29,7 +30,7 @@ WORKDIR /service -ENV JAVA_VERSION_MAJOR=8 \ +ENV JAVA_VERSION_MAJOR=11 \ JAVA_VERSION_MINOR=111 \ JAVA_HOME=/usr/lib/jvm/default-jvm \ PATH=${PATH}:/usr/lib/jvm/default-jvm/bin/ @@ -44,11 +45,11 @@ RUN add-apt-repository ppa:openjdk-r/ppa -y && \ # upgrade OS apt-get -y dist-upgrade && \ # Make info file about this build - printf "Build of java:openjdk-8-jre-headless, date: %s\n" `date -u +"%Y-%m-%dT%H:%M:%SZ"` > /service/java && \ + printf "Build of java:openjdk-11-jre-headless, date: %s\n" `date -u +"%Y-%m-%dT%H:%M:%SZ"` > /service/java && \ # install application - apt-get install -y --no-install-recommends openjdk-8-jre-headless && \ + apt-get install -y --no-install-recommends openjdk-11-jre-headless && \ # fix default setting - ln -s java-8-openjdk-amd64 /usr/lib/jvm/default-jvm && \ + ln -s java-11-openjdk-amd64 /usr/lib/jvm/default-jvm && \ # remove apt cache from image apt-get clean all |