diff options
| author |   Fiete Ostkamp <Fiete.Ostkamp@telekom.de> | 2025-03-20 11:06:06 +0100 |
|---|---|---|
| committer | Fiete Ostkamp <Fiete.Ostkamp@telekom.de> | 2025-03-20 11:07:20 +0100 |
| commit | 22e594d61675533b62355e163375b4ef149d7f6f (patch) | |
| tree | e02181b546703110d3bb37c37845722ed745f745 /src/main | |
| parent | 8617924bec251d125f051425753befdbc68e9610 (diff) | |
- use eclipse-temurin:11-jre-alpine base image instead of
aai-common image
Issue-ID: AAI-4148
Change-Id: Ia504910996e0c2cf945c83a5f2b1d2117a22ee86
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Diffstat (limited to 'src/main')
| -rwxr-xr-x[-rw-r--r--] | src/main/bin/start.sh | 2 | ||||
| -rw-r--r-- | src/main/docker/Dockerfile | 19 |
2 files changed, 6 insertions, 15 deletions
diff --git a/src/main/bin/start.sh b/src/main/bin/start.sh index ea42d7f..75ade4e 100644..100755 --- a/src/main/bin/start.sh +++ b/src/main/bin/start.sh @@ -39,7 +39,7 @@ PROPS="$PROPS -Dcom.att.eelf.logging.path=$AJSC_HOME" PROPS="$PROPS -Dcom.att.eelf.logging.file=logback.xml" PROPS="$PROPS -Dlogback.configurationFile=$AJSC_HOME/logback.xml" PROPS="$PROPS -Dserver.port=9500" -JVM_MAX_HEAP=${MAX_HEAP:-1024} +JVM_ARGS="${JVM_ARGS} -XX:MaxRAMPercentage=${MAX_RAM_PERCENTAGE:-70}"; echo "java $java_runtime_arguments $PROPS -jar $JARFILE" java $java_runtime_arguments ${JVM_ARGS} $PROPS -jar $JARFILE diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile index 10bc3e6..34e3866 100644 --- a/src/main/docker/Dockerfile +++ b/src/main/docker/Dockerfile @@ -1,18 +1,9 @@ -FROM @aai.docker.namespace@/aai-common-@aai.base.image@:@aai.base.image.version@ - -ARG MICRO_HOME=/opt/app/model-loader +FROM eclipse-temurin:11-jre-alpine +USER nobody +ENV MICRO_HOME=/opt/app/model-loader WORKDIR $MICRO_HOME -USER root - -RUN mkdir -p /opt/aaihome $MICRO_HOME /logs && \ - ln -s /logs $MICRO_HOME/logs && \ - chown -R aaiadmin:aaiadmin $MICRO_HOME && \ - chown -R aaiadmin:aaiadmin /logs - -COPY --chown=aaiadmin:aaiadmin /maven/model-loader/ . - -ENTRYPOINT ["/bin/bash", "/opt/app/model-loader/bin/start.sh"] +COPY --chown=nobody:nobody /maven/model-loader/ . -USER aaiadmin +ENTRYPOINT ["/bin/sh", "/opt/app/model-loader/bin/start.sh"] |