From 0e302ed774f4c371b9414fe99836836f775b688d Mon Sep 17 00:00:00 2001 From: Instrumental Date: Tue, 16 Jul 2019 04:02:30 -0500 Subject: [PATCH] Reduce Docker Layers Issue-ID: AAF-873 Change-Id: I590b5df27ce3266c2dac2200864ad5186da16114 Signed-off-by: Instrumental --- .../org/onap/aaf/auth/cm/service/CMService.java | 2 +- auth/docker/Dockerfile.core | 8 +++- auth/docker/Dockerfile.ms | 47 ---------------------- auth/docker/dbuild.sh | 44 +++++--------------- auth/docker/drun.sh | 2 +- auth/helm/aaf/templates/aaf-cm.yaml | 2 +- auth/helm/aaf/templates/aaf-fs.yaml | 2 +- auth/helm/aaf/templates/aaf-gui.yaml | 2 +- auth/helm/aaf/templates/aaf-locate.yaml | 2 +- auth/helm/aaf/templates/aaf-oauth.yaml | 2 +- auth/helm/aaf/templates/aaf-service.yaml | 2 +- 11 files changed, 24 insertions(+), 91 deletions(-) delete mode 100644 auth/docker/Dockerfile.ms diff --git a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/service/CMService.java b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/service/CMService.java index 85424de1..893a6b17 100644 --- a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/service/CMService.java +++ b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/service/CMService.java @@ -286,7 +286,7 @@ public class CMService { // Make sure Primary is the first in fqdns if (fqdns.size() > 1) { for (int i = 0; i < fqdns.size(); ++i) { - if (primary==null) { + if (primary==null && !ignoreIPs) { trans.error().log("CMService var primary is null"); } else { String fg = fqdns.get(i); diff --git a/auth/docker/Dockerfile.core b/auth/docker/Dockerfile.core index f74e9fbd..a8aa543b 100644 --- a/auth/docker/Dockerfile.core +++ b/auth/docker/Dockerfile.core @@ -30,5 +30,11 @@ COPY lib /opt/app/aaf/lib COPY bin /opt/app/aaf/bin COPY theme /opt/app/aaf/theme -RUN if [ -n "${DUSER}" ]; then chown -R ${DUSER}:${DUSER} /opt/app/aaf; fi +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 diff --git a/auth/docker/Dockerfile.ms b/auth/docker/Dockerfile.ms deleted file mode 100644 index 351c3798..00000000 --- a/auth/docker/Dockerfile.ms +++ /dev/null @@ -1,47 +0,0 @@ -######### -# ============LICENSE_START==================================================== -# org.onap.aaf -# =========================================================================== -# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. -# =========================================================================== -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============LICENSE_END==================================================== -# -FROM ${DOCKER_REPOSITORY}/onap/aaf/aaf_core:${AAF_VERSION} -MAINTAINER AAF Team, AT&T 2018 -ENV VERSION=${AAF_VERSION} - -LABEL description="aaf_${AAF_COMPONENT}" -LABEL version=${AAF_VERSION} - -COPY bin/pod_wait.sh /opt/app/aaf/bin/ -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 - -#CMD ["bash","-c","cd /opt/app/aaf;bin/${AAF_COMPONENT}"] -CMD [] - -# For Debugging installation -# CMD ["/bin/bash","-c","pwd;cd /opt/app/osaaf;find /opt/app/osaaf -depth;df -k; cat /opt/app/aaf/${AAF_COMPONENT}/bin/${AAF_COMPONENT};cat /etc/hosts;/opt/app/aaf/${AAF_COMPONENT}/bin/${AAF_COMPONENT}"] -# Java Debugging VM Args -# "-Xdebug",\ -# "-Xnoagent",\ -# "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000",\ - -# TLS Debugging VM Args -# "-Djavax.net.debug","ssl", \ - diff --git a/auth/docker/dbuild.sh b/auth/docker/dbuild.sh index fab4b15a..3ecdd112 100755 --- a/auth/docker/dbuild.sh +++ b/auth/docker/dbuild.sh @@ -58,7 +58,8 @@ cd ../auth-cass/docker bash ./dbuild.sh $DOCKER_PULL_REGISTRY cd - -# AAF Base version - set the core image, etc +######## +# First, build a AAF Base version - set the core image, etc sed -e 's/${AAF_VERSION}/'${VERSION}'/g' \ -e 's/${DUSER}/'${DUSER}'/g' \ -e 's/${REGISTRY}/'${DOCKER_PULL_REGISTRY}'/g' \ @@ -68,7 +69,8 @@ $DOCKER tag ${ORG}/${PROJECT}/aaf_base:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${ $DOCKER tag ${ORG}/${PROJECT}/aaf_base:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_base:latest rm Dockerfile -# Create the AAF Config (Security) Images +######## +# Second, Create the AAF Config (Security) Images cd .. cp auth-cmd/target/aaf-auth-cmd-$VERSION-full.jar sample/bin cp auth-batch/target/aaf-auth-batch-$VERSION-full.jar sample/bin @@ -101,8 +103,9 @@ rm -Rf sample/CA cd - ######## -# Second, build a core Docker Image +# Third, build a core Docker Image to be used for all AAF Components echo Building aaf_$AAF_COMPONENT... +cp ../sample/bin/pod_wait.sh ../aaf_${VERSION}/bin # Apply currrent Properties to Docker file, and put in place. sed -e 's/${AAF_VERSION}/'${VERSION}'/g' \ -e 's/${AAF_COMPONENT}/'${AAF_COMPONENT}'/g' \ @@ -117,38 +120,9 @@ $DOCKER build -t ${ORG}/${PROJECT}/aaf_core:${VERSION} aaf_${VERSION} $DOCKER tag ${ORG}/${PROJECT}/aaf_core:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_core:${VERSION} $DOCKER tag ${ORG}/${PROJECT}/aaf_core:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_core:latest rm aaf_${VERSION}/Dockerfile -cd - -####### -# Do all the Containers related to AAF Services -####### -AAF_COMPONENTS=$(cat components) - -cp ../sample/bin/pod_wait.sh ../aaf_${VERSION}/bin -for AAF_COMPONENT in ${AAF_COMPONENTS}; do - echo Building aaf_$AAF_COMPONENT... - if [ "hello" = "${AAF_COMPONENT}" ]; then - echo Building Hello separately - DF="Dockerfile.hello" - cp -Rf ../sample/etc ../aaf_${VERSION}/etc - else - DF="Dockerfile.ms" - fi - sed -e 's/${AAF_VERSION}/'${VERSION}'/g' \ - -e 's/${AAF_COMPONENT}/'${AAF_COMPONENT}'/g' \ - -e 's/${DOCKER_REPOSITORY}/'${DOCKER_REPOSITORY}'/g' \ - -e 's/${DUSER}/'${DUSER}'/g' \ - $DF >../aaf_${VERSION}/Dockerfile - cd .. - $DOCKER build -t ${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION} aaf_${VERSION} - $DOCKER tag ${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION} - $DOCKER tag ${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:latest - rm aaf_${VERSION}/Dockerfile - if [ -e aaf_${VERSION}/etc ]; then - rm -Rf aaf_${VERSION}/etc - fi - cd - -done # Final cleanup -rm ../aaf_${VERSION}/bin/pod_wait.sh +rm aaf_${VERSION}/bin/pod_wait.sh + +cd - diff --git a/auth/docker/drun.sh b/auth/docker/drun.sh index 1910f4a2..03d8e9cd 100644 --- a/auth/docker/drun.sh +++ b/auth/docker/drun.sh @@ -116,6 +116,6 @@ for AAF_COMPONENT in ${AAF_COMPONENTS}; do $PUBLISH \ -v "aaf_config:$CONF_ROOT_DIR" \ -v "aaf_status:/opt/app/aaf/status" \ - ${PREFIX}${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION} \ + ${PREFIX}${ORG}/${PROJECT}/aaf_core:${VERSION} \ /bin/bash -c "$CMD_LINE" done diff --git a/auth/helm/aaf/templates/aaf-cm.yaml b/auth/helm/aaf/templates/aaf-cm.yaml index 6542440b..f254bfde 100644 --- a/auth/helm/aaf/templates/aaf-cm.yaml +++ b/auth/helm/aaf/templates/aaf-cm.yaml @@ -102,7 +102,7 @@ spec: ### AAF-CERTMAN ### - name: aaf-cm - image: {{ .Values.image.repository }}onap/aaf/aaf_cm:{{ .Values.image.version }} + image: {{ .Values.image.repository }}onap/aaf/aaf_core:{{ .Values.image.version }} imagePullPolicy: IfNotPresent command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-cm nc aaf-cass.{{ .Release.Namespace }} {{ .Values.services.cass.native_trans_port }} aaf-locate && exec bin/cm"] volumeMounts: diff --git a/auth/helm/aaf/templates/aaf-fs.yaml b/auth/helm/aaf/templates/aaf-fs.yaml index 51c33672..5bca6964 100644 --- a/auth/helm/aaf/templates/aaf-fs.yaml +++ b/auth/helm/aaf/templates/aaf-fs.yaml @@ -96,7 +96,7 @@ spec: ### AAF-FS ### - name: aaf-fs - image: {{ .Values.image.repository }}onap/aaf/aaf_fs:{{ .Values.image.version }} + image: {{ .Values.image.repository }}onap/aaf/aaf_core:{{ .Values.image.version }} imagePullPolicy: IfNotPresent command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-fs aaf-locate && exec bin/fs"] volumeMounts: diff --git a/auth/helm/aaf/templates/aaf-gui.yaml b/auth/helm/aaf/templates/aaf-gui.yaml index 4c540778..c737c7a5 100644 --- a/auth/helm/aaf/templates/aaf-gui.yaml +++ b/auth/helm/aaf/templates/aaf-gui.yaml @@ -105,7 +105,7 @@ spec: ### AAF-GUI ### - name: aaf-gui - image: {{ .Values.image.repository }}onap/aaf/aaf_gui:{{ .Values.image.version }} + image: {{ .Values.image.repository }}onap/aaf/aaf_core:{{ .Values.image.version }} imagePullPolicy: IfNotPresent command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-gui aaf-locate && exec bin/gui"] volumeMounts: diff --git a/auth/helm/aaf/templates/aaf-locate.yaml b/auth/helm/aaf/templates/aaf-locate.yaml index c0bb3f92..44531d97 100644 --- a/auth/helm/aaf/templates/aaf-locate.yaml +++ b/auth/helm/aaf/templates/aaf-locate.yaml @@ -102,7 +102,7 @@ spec: ### AAF-LOCATE ### - name: aaf-locate - image: {{ .Values.image.repository }}onap/aaf/aaf_locate:{{ .Values.image.version }} + image: {{ .Values.image.repository }}onap/aaf/aaf_core:{{ .Values.image.version }} imagePullPolicy: IfNotPresent command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-locate nc aaf-cass.{{ .Release.Namespace }} {{ .Values.services.cass.native_trans_port }} aaf-service && exec bin/locate"] volumeMounts: diff --git a/auth/helm/aaf/templates/aaf-oauth.yaml b/auth/helm/aaf/templates/aaf-oauth.yaml index de66b4f1..9721b396 100644 --- a/auth/helm/aaf/templates/aaf-oauth.yaml +++ b/auth/helm/aaf/templates/aaf-oauth.yaml @@ -102,7 +102,7 @@ spec: ### AAF-OAUTH ### - name: aaf-oauth - image: {{ .Values.image.repository }}onap/aaf/aaf_oauth:{{ .Values.image.version }} + image: {{ .Values.image.repository }}onap/aaf/aaf_core:{{ .Values.image.version }} imagePullPolicy: IfNotPresent command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-oauth nc aaf-cass.{{ .Release.Namespace }} {{ .Values.services.cass.native_trans_port }} aaf-service && exec bin/oauth"] volumeMounts: diff --git a/auth/helm/aaf/templates/aaf-service.yaml b/auth/helm/aaf/templates/aaf-service.yaml index 2b274984..fc0ce66c 100644 --- a/auth/helm/aaf/templates/aaf-service.yaml +++ b/auth/helm/aaf/templates/aaf-service.yaml @@ -99,7 +99,7 @@ spec: ### AAF-SERVICE ### - name: aaf-service - image: {{ .Values.image.repository }}onap/aaf/aaf_service:{{ .Values.image.version }} + image: {{ .Values.image.repository }}onap/aaf/aaf_core:{{ .Values.image.version }} imagePullPolicy: IfNotPresent command: ["/bin/bash","-c","cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-service nc aaf-cass.{{ .Release.Namespace }} {{ .Values.services.cass.native_trans_port }} aaf-cass && exec bin/service"] volumeMounts: -- 2.16.6