diff options
Diffstat (limited to 'aai-traversal')
| -rw-r--r-- | aai-traversal/pom.xml | 4 | ||||
| -rw-r--r-- | aai-traversal/src/main/docker/Dockerfile | 26 |
2 files changed, 20 insertions, 10 deletions
diff --git a/aai-traversal/pom.xml b/aai-traversal/pom.xml index ef7b2a9..f4b6846 100644 --- a/aai-traversal/pom.xml +++ b/aai-traversal/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.aai.traversal</groupId> <artifactId>traversal</artifactId> - <version>1.13.1-SNAPSHOT</version> + <version>1.13.2-SNAPSHOT</version> </parent> <groupId>org.onap.aai.traversal</groupId> <artifactId>aai-traversal</artifactId> @@ -60,7 +60,7 @@ <aai.docker.version>1.0.0</aai.docker.version> <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.13.1</aai.base.image.version> <!-- Nexus Proxy Properties and Snapshot Locations Ideally this can be overwritten at runtime per internal environment specific values at runtime --> diff --git a/aai-traversal/src/main/docker/Dockerfile b/aai-traversal/src/main/docker/Dockerfile index c8c346d..2998ec2 100644 --- a/aai-traversal/src/main/docker/Dockerfile +++ b/aai-traversal/src/main/docker/Dockerfile @@ -1,21 +1,31 @@ FROM @aai.docker.namespace@/aai-common-@aai.base.image@:@aai.base.image.version@ -RUN mkdir -p /opt/aaihome/aaiadmin /opt/aai/logroot/AAI-GQ - +USER root +# RUN addgroup aaiadmin -g 1000 +# RUN adduser -u 1000 -h /opt/aaihome/aaiadmin -S -D -G aaiadmin -s /bin/bash aaiadmin +# RUN groupadd aaiadmin -g 1000 \ +# && adduser -u 1000 -h /opt/aaihome/aaiadmin -S -D -G aaiadmin -s /bin/bash aaiadmin \ +# && mkdir -p /opt/aaihome/aaiadmin /opt/aai/logroot/AAI-GQ \ +# && chown -R aaiadmin:aaiadmin /opt/aaihome/aaiadmin /opt/aai/logroot/AAI-GQ \ +# && chown -R aaiadmin:aaiadmin /opt/app/aai-traversal /etc/profile.d /opt/app /opt/aai/logroot +RUN mkdir -p \ + /opt/aaihome/aaiadmin \ + /opt/aai/logroot/AAI-GQ \ + /opt/app/aai-traversal \ + /opt/aai/logroot \ + && chown -R aaiadmin:aaiadmin \ + /opt/app/aai-traversal \ + /etc/profile.d \ + /opt/app \ + /opt/aai/logroot VOLUME /tmp VOLUME /opt/tools HEALTHCHECK --interval=40s --timeout=10s --retries=3 CMD nc -z -v localhost 8446 || exit 1 -RUN groupadd aaiadmin -g 1000 - -RUN adduser -u 1000 -h /opt/aaihome/aaiadmin -S -D -G aaiadmin -s /bin/bash aaiadmin - # Add the proper files into the docker image from your build WORKDIR /opt/app/aai-traversal -RUN chown -R aaiadmin:aaiadmin /opt/app/aai-traversal /etc/profile.d /opt/aai/logroot/AAI-GQ /opt/app /opt/aai/logroot - COPY --chown=aaiadmin:aaiadmin /maven/aai-traversal/ . USER aaiadmin |