From a6042198c10bcf2706aacbf347f21c47255b89d7 Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Thu, 8 Feb 2024 13:29:52 +0100 Subject: Update aai-common-alpine base image in resources - update to latest aai-common-alpine image that is now based on eclipse-temurin:8-jre-alpine Issue-ID: AAI-3662 Change-Id: Ic807e5eb5e412d3511d7b7bf7adf8b0851c4cf9d Signed-off-by: Fiete Ostkamp --- aai-resources/pom.xml | 2 +- aai-resources/src/main/docker/Dockerfile | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml index 81013d5..6286c91 100644 --- a/aai-resources/pom.xml +++ b/aai-resources/pom.xml @@ -41,7 +41,7 @@ localhost:5000 1.0.0 alpine - 1.6.0 + ${aai.common.version} 4.1.63.Final 4.1.63.Final diff --git a/aai-resources/src/main/docker/Dockerfile b/aai-resources/src/main/docker/Dockerfile index be115e7..754c49a 100644 --- a/aai-resources/src/main/docker/Dockerfile +++ b/aai-resources/src/main/docker/Dockerfile @@ -1,5 +1,6 @@ FROM @aai.docker.namespace@/aai-common-@aai.base.image@:@aai.base.image.version@ +USER root RUN mkdir -p /opt/aaihome/aaiadmin /opt/aai/logroot/AAI-RES /opt/bulkprocess_load @@ -15,14 +16,14 @@ ENV AAI_BUILD_VERSION @aai.docker.version@ # 8447 is the important one to be used EXPOSE 8447 -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-resources -RUN chown -R aaiadmin:aaiadmin /opt/app/aai-resources /etc/profile.d /opt/aai/logroot/AAI-RES /opt/bulkprocess_load +RUN chown -R aaiadmin:aaiadmin \ + /opt/app/aai-resources \ + /etc/profile.d \ + /opt/aai/logroot/AAI-RES \ + /opt/bulkprocess_load COPY --chown=aaiadmin:aaiadmin /maven/aai-resources/ . -- cgit 1.2.3-korg