From ce788a66989590a2fd1291390fb2f6489cc38e7c Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Mon, 16 Oct 2023 09:59:14 +0200 Subject: Update aai-common-alpine base image in resources - update [aai-common-alpine](https://hub.docker.com/r/onap/aai-common-alpine/tags) base image from 1.6.0 to 1.9.6 - add README-instructions for building the docker image Issue-ID: AAI-3662 Signed-off-by: Fiete Ostkamp Change-Id: Ic0f1993520b95f435543e12ac7b332fb4f4d5f94 --- README.md | 7 +++++++ aai-resources/pom.xml | 2 +- aai-resources/src/main/docker/Dockerfile | 6 ++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 941a734..554c020 100644 --- a/README.md +++ b/README.md @@ -48,3 +48,10 @@ Integration tests are located in `it` directory, and disabled by default in the `true` As a naming convention, All integration test classes should end with `IT`, and will be executed by changing the `skipITs` value in pom file, or through the command line `-DskipITs=false` + +## Docker + +To build the docker image, the maven `docker` profile can be used: +```sh +JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 mvn clean install -P docker -DskipTests +``` \ No newline at end of file diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml index 631e7e8..ecb1e61 100644 --- a/aai-resources/pom.xml +++ b/aai-resources/pom.xml @@ -41,7 +41,7 @@ localhost:5000 1.0.0 alpine - 1.6.0 + 1.9.6 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..f8b9820 100644 --- a/aai-resources/src/main/docker/Dockerfile +++ b/aai-resources/src/main/docker/Dockerfile @@ -1,6 +1,8 @@ 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 +RUN chown -R aaiadmin:aaiadmin /opt/aaihome /opt/aai/logroot/AAI-RES /opt/bulkprocess_load VOLUME /tmp @@ -15,10 +17,6 @@ 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 -- cgit 1.2.3-korg