diff options
| author |   Harish Venkata Kajur <vk250x@att.com> | 2021-02-23 22:55:16 -0500 |
|---|---|---|
| committer | Harish Venkata Kajur <vk250x@att.com> | 2021-02-23 23:35:22 -0500 |
| commit | 3fb4c441eeb21e9800bb3f6c33164d8232749245 (patch) | |
| tree | c53b8033ea3f558a7a4fdf35d8e0e084c08fb3f3 /sparkybe-onap-application | |
| parent | 39885f7866165946b02dd36ee1f9ce93eecdda5f (diff) | |
Update base docker image to use java 11
Also update maven plugin to target java 11
Issue-ID: AAI-3272
Change-Id: Iac09b0d91022cf7fdfc932e67753e164ee6463cf
Signed-off-by: Harish Venkata Kajur <vk250x@att.com>
Diffstat (limited to 'sparkybe-onap-application')
| -rw-r--r-- | sparkybe-onap-application/pom.xml | 6 | ||||
| -rw-r--r-- | sparkybe-onap-application/src/main/docker/Dockerfile | 36 |
2 files changed, 11 insertions, 31 deletions
diff --git a/sparkybe-onap-application/pom.xml b/sparkybe-onap-application/pom.xml index 0642cca..e216301 100644 --- a/sparkybe-onap-application/pom.xml +++ b/sparkybe-onap-application/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.aai</groupId> <artifactId>sparky-be</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.0.3-SNAPSHOT</version> </parent> <groupId>org.onap.aai.sparky-be</groupId> <artifactId>sparkybe-onap-application</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.0.3-SNAPSHOT</version> <packaging>jar</packaging> <properties> @@ -36,7 +36,7 @@ </aai.build.directory> <aai.docker.namespace>onap</aai.docker.namespace> <aai.base.image>alpine</aai.base.image> - <aai.base.image.version>1.6.0</aai.base.image.version> + <aai.base.image.version>1.8.1</aai.base.image.version> <!-- This will be used for the docker images as the default format of maven build has issues --> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> </properties> diff --git a/sparkybe-onap-application/src/main/docker/Dockerfile b/sparkybe-onap-application/src/main/docker/Dockerfile index 035abd2..6f95de0 100644 --- a/sparkybe-onap-application/src/main/docker/Dockerfile +++ b/sparkybe-onap-application/src/main/docker/Dockerfile @@ -4,41 +4,21 @@ ARG MICRO_HOME=/opt/app/sparky ARG BIN_HOME=$MICRO_HOME/bin ARG UI_LOGS=/var/log/onap/AAI-UI -# Build up the deployment folder structure -RUN mkdir -p $MICRO_HOME $MICRO_HOME/logs $UI_LOGS - -# Changes related to:AAI-2180 -# Additional optional steps for Ubuntu -RUN if ((uname -v | grep -i "ubuntu") || ( cat /etc/*release|grep -i "ubuntu") ) ; then \ - ##################################### - #if JAVA doesnt exist then install it: - ###################################### - if type java 2>/dev/null; then \ - echo "skipping java installation"; \ - else \ - apt-get update && apt-get install -y software-properties-common; \ - ## sudo -E is required to preserve the environment. If you remove that line, it will most like freeze at this step - sudo -E add-apt-repository ppa:openjdk-r/ppa && apt-get update && apt-get install -y openjdk-8-jdk ; \ - ## Setup JAVA_HOME, this is useful for docker commandline - JAVA_HOME=usr/lib/jvm/java-8-openjdk-amd64; \ - export JAVA_HOME ; \ - fi; \ -fi - -RUN groupadd aaiadmin -g 1000 -RUN adduser -u 1000 -h /opt/aaihome/aaiadmin -S -D -G aaiadmin -s /bin/bash aaiadmin +USER root WORKDIR $MICRO_HOME -RUN chown -R aaiadmin:aaiadmin $MICRO_HOME $MICRO_HOME/logs $UI_LOGS COPY --chown=aaiadmin:aaiadmin /maven/sparkybe-onap-application/ . -USER aaiadmin +# Build up the deployment folder structure +RUN mkdir -p $MICRO_HOME $MICRO_HOME/logs $UI_LOGS && \ + chown -R aaiadmin:aaiadmin $MICRO_HOME/logs $UI_LOGS && \ + chmod 755 $BIN_HOME/* && \ + ln -snf /logs $MICRO_HOME/logs -RUN chmod 755 $BIN_HOME/* \ - && ln -snf /logs $MICRO_HOME/logs +USER aaiadmin EXPOSE 8000 8000 EXPOSE 9517 9517 - + CMD ["/opt/app/sparky/bin/start.sh"] |