Merge "Make OOM workable with Dublin"2.1.11

5 files changed, 20 insertions, 16 deletions

diff --git a/auth/docker/Dockerfile.agent b/auth/docker/Dockerfile.agent
index b62f7b4f..669665cc 100644
--- a/auth/docker/Dockerfile.agent
+++ b/auth/docker/Dockerfile.agent
@@ -25,11 +25,12 @@ LABEL description="aaf_agent"
 LABEL version=${AAF_VERSION}
 
 COPY bin/client.sh /opt/app/aaf_config/bin/agent.sh
+COPY bin/pod_wait.sh /opt/app/aaf_config/bin/pod_wait.sh
 COPY bin/aaf-auth-cmd-${AAF_VERSION}-full.jar /opt/app/aaf_config/bin/
 COPY bin/aaf-cadi-servlet-sample-*-sample.jar /opt/app/aaf_config/bin/
 COPY logs /opt/app/aaf_config/logs
 COPY cert/*trust*.b64 /opt/app/aaf_config/cert/
-
-RUN if [ -n "${DUSER}" ]; then chown -R ${DUSER}:${DUSER} /opt/app/aaf_config; fi
+RUN chmod 755 /opt/app/aaf_config/bin/* &&\
+    if [ -n "${DUSER}" ]; then chown -R ${DUSER}:${DUSER} /opt/app/aaf_config; fi
 
 CMD []
diff --git a/auth/docker/Dockerfile.base b/auth/docker/Dockerfile.base
index 35ade62b..e7ae6432 100644
--- a/auth/docker/Dockerfile.base
+++ b/auth/docker/Dockerfile.base
@@ -22,8 +22,8 @@ FROM ${REGISTRY}/openjdk:8-jre-alpine
 MAINTAINER AAF Team, AT&T 2018
 
 LABEL description="aaf_base"
-RUN apk add --no-cache bash
-RUN apk add --no-cache openssl
-RUN apk add --no-cache curl
-RUN if [ -n "${DUSER}" ]; then addgroup ${DUSER} && adduser ${DUSER} -G ${DUSER} -D -s /bin/bash; fi
+RUN apk add --no-cache bash &&\
+    apk add --no-cache openssl &&\
+    apk add --no-cache curl &&\
+    if [ -n "${DUSER}" ]; then addgroup ${DUSER} && adduser ${DUSER} -G ${DUSER} -D -s /bin/bash; fi
 
diff --git a/auth/docker/Dockerfile.config b/auth/docker/Dockerfile.config
index 27b2ffff..7b159d7c 100644
--- a/auth/docker/Dockerfile.config
+++ b/auth/docker/Dockerfile.config
@@ -32,11 +32,12 @@ COPY cert /opt/app/aaf_config/cert
 COPY public /opt/app/aaf_config/public
 COPY CA /opt/app/aaf_config/CA
 COPY bin/service.sh /opt/app/aaf_config/bin/agent.sh
-COPY bin/pod_wait.sh /opt/app/aaf_config/bin/
+COPY bin/pod_wait.sh /opt/app/aaf_config/bin/pod_wait.sh
 COPY bin/aaf-auth-cmd-${AAF_VERSION}-full.jar /opt/app/aaf_config/bin/
 COPY bin/aaf-auth-batch-${AAF_VERSION}-full.jar /opt/app/aaf_config/bin/
 
-RUN mkdir -p /opt/app/osaaf 
-RUN if [ -n "${DUSER}" ]; then chown ${DUSER}:${DUSER} /opt/app/osaaf && chown -R ${DUSER}:${DUSER} /opt/app/aaf_config; fi
+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
 
 CMD ["/bin/bash","/opt/app/aaf_config/bin/agent.sh"]
diff --git a/auth/docker/Dockerfile.hello b/auth/docker/Dockerfile.hello
index 0d2a062c..2002822a 100644
--- a/auth/docker/Dockerfile.hello
+++ b/auth/docker/Dockerfile.hello
@@ -26,9 +26,10 @@ LABEL version=${AAF_VERSION}
  
 COPY bin/pod_wait.sh /opt/app/aaf/bin/
 COPY etc /opt/app/osaaf/etc
-RUN mkdir -p /opt/app/aaf/status
-RUN if [ -n "${DUSER}" ]; then  chown ${DUSER}:${DUSER} /opt/app/aaf/status \
-    && chown ${DUSER}:${DUSER} /opt/app/osaaf \
-    && chown -R ${DUSER}:${DUSER} /opt/app/aaf; fi
+RUN mkdir -p /opt/app/aaf/status && chmod 755 /opt/app/aaf/bin/* &&\
+    if [ -n "${DUSER}" ]; then \
+       chown ${DUSER}:${DUSER} /opt/app/aaf/status &&\
+       chown ${DUSER}:${DUSER} /opt/app/osaaf &&\
+       chown -R ${DUSER}:${DUSER} /opt/app/aaf; fi
 
 CMD []
diff --git a/auth/docker/Dockerfile.ms b/auth/docker/Dockerfile.ms
index ead958b3..351c3798 100644
--- a/auth/docker/Dockerfile.ms
+++ b/auth/docker/Dockerfile.ms
@@ -25,9 +25,10 @@ LABEL description="aaf_${AAF_COMPONENT}"
 LABEL version=${AAF_VERSION}
  
 COPY bin/pod_wait.sh /opt/app/aaf/bin/
-RUN mkdir -p /opt/app/osaaf 
-RUN mkdir -p /opt/app/aaf/status
-RUN if [ -n "${DUSER}" ]; then  chown ${DUSER}:${DUSER} /opt/app/aaf/status \
+RUN mkdir -p /opt/app/osaaf &&\
+    mkdir -p /opt/app/aaf/status &&\
+    chmod 755 /opt/app/aaf/bin/* &&\
+    if [ -n "${DUSER}" ]; then  chown ${DUSER}:${DUSER} /opt/app/aaf/status \
     && chown ${DUSER}:${DUSER} /opt/app/osaaf \
     && chown -R ${DUSER}:${DUSER} /opt/app/aaf; fi