From 48bcfb9d4b03ac3e2e6915f7bdf72599c8794d43 Mon Sep 17 00:00:00 2001 From: ChrisC Date: Tue, 17 Mar 2020 14:23:42 +0100 Subject: AAF non-root update AAF service dockerfiles to run as user AAF, reusing existing script infra Issue-ID: AAF-1102 Signed-off-by: ChrisC , JulienBe Change-Id: I2d9feef65a98d4545e407825533cd1741f891b45 --- auth/docker/Dockerfile.agent | 2 +- auth/docker/Dockerfile.config | 2 +- auth/docker/Dockerfile.core | 2 +- auth/docker/Dockerfile.hello | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'auth/docker') diff --git a/auth/docker/Dockerfile.agent b/auth/docker/Dockerfile.agent index ec5f24ea..e974dc49 100644 --- a/auth/docker/Dockerfile.agent +++ b/auth/docker/Dockerfile.agent @@ -31,5 +31,5 @@ COPY bin/aaf-cadi-servlet-sample-*-sample.jar /opt/app/aaf_config/bin/ COPY cert/*trust*.b64 /opt/app/aaf_config/cert/ RUN chmod 755 /opt/app/aaf_config/bin/* &&\ if [ -n "${DUSER}" ]; then chown -R ${DUSER}:${DUSER} /opt/app/aaf_config; fi - +USER ${DUSER} CMD [] diff --git a/auth/docker/Dockerfile.config b/auth/docker/Dockerfile.config index 4bb7a940..b2263ecc 100644 --- a/auth/docker/Dockerfile.config +++ b/auth/docker/Dockerfile.config @@ -39,5 +39,5 @@ COPY bin/aaf-auth-batch-${JAR_VERSION}-full.jar /opt/app/aaf_config/bin/ RUN mkdir -p /opt/app/osaaf &&\ chmod 755 /opt/app/aaf_config/bin/*.sh &&\ if [ -n "${DUSER}" ]; then chown ${DUSER}:${DUSER} /opt/app/osaaf && chown -R ${DUSER}:${DUSER} /opt/app/aaf_config; fi - +USER ${DUSER} CMD ["/bin/bash","/opt/app/aaf_config/bin/agent.sh"] diff --git a/auth/docker/Dockerfile.core b/auth/docker/Dockerfile.core index 5c66c8ca..4179c5e7 100644 --- a/auth/docker/Dockerfile.core +++ b/auth/docker/Dockerfile.core @@ -37,4 +37,4 @@ RUN mkdir -p /opt/app/osaaf &&\ && chown ${DUSER}:${DUSER} /opt/app/osaaf \ && chown -R ${DUSER}:${DUSER} /opt/app/aaf;\ fi - +USER ${DUSER} diff --git a/auth/docker/Dockerfile.hello b/auth/docker/Dockerfile.hello index 4b12a6f1..82d9a9f5 100644 --- a/auth/docker/Dockerfile.hello +++ b/auth/docker/Dockerfile.hello @@ -37,5 +37,5 @@ RUN mkdir -p /opt/app/osaaf &&\ && chown ${DUSER}:${DUSER} /opt/app/osaaf \ && chown -R ${DUSER}:${DUSER} /opt/app/aaf;\ fi - +USER ${DUSER} CMD [] -- cgit 1.2.3-korg