From d822087391e41355aee18ce65879f37f65c46314 Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Tue, 16 Jan 2024 17:24:33 +0100 Subject: Update aai-common base image in aai-traversal - update aai-common base image from 1.6.0 to 1.13.1 Issue-ID: AAI-3732 Change-Id: I6f96d34a30031423d1b2e35a95ccab9ace6b657a Signed-off-by: Fiete Ostkamp --- aai-traversal/src/main/docker/Dockerfile | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) (limited to 'aai-traversal/src/main') 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 -- cgit 1.2.3-korg