Docker Jar SNAPSHOT issues

Issue-ID: AAF-917
Change-Id: Ic3af68bb26d9cb29f1493c53571266ab80a5a82f
Signed-off-by: Instrumental <jonathan.gathman@att.com>

diff --git a/auth/docker/Dockerfile.agent b/auth/docker/Dockerfile.agent
index 20406a4..ec5f24e 100644 (file)
--- a/auth/docker/Dockerfile.agent
+++ b/auth/docker/Dockerfile.agent
@@ -26,7 +26,7 @@ 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-cadi-aaf-${AAF_VERSION}-full.jar /opt/app/aaf_config/bin/
+COPY bin/aaf-cadi-aaf-${JAR_VERSION}-full.jar /opt/app/aaf_config/bin/
 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/* &&\

diff --git a/auth/docker/Dockerfile.config b/auth/docker/Dockerfile.config
index 7b159d7..4bb7a94 100644 (file)
--- a/auth/docker/Dockerfile.config
+++ b/auth/docker/Dockerfile.config
@@ -33,8 +33,8 @@ 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/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/
+COPY bin/aaf-auth-cmd-${JAR_VERSION}-full.jar /opt/app/aaf_config/bin/
+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 &&\

diff --git a/auth/docker/Dockerfile.ms b/auth/docker/Dockerfile.ms
deleted file mode 100644 (file)
index 351c379..0000000
--- 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/agent.sh b/auth/docker/agent.sh
index 3291087..4611f77 100644 (file)
--- a/auth/docker/agent.sh
+++ b/auth/docker/agent.sh
@@ -28,7 +28,7 @@ fi
 . ./aaf.props
 
 DOCKER=${DOCKER:=docker}
-CADI_VERSION=${CADI_VERSION:=2.1.15-SNAPSHOT}
+CADI_VERSION=${CADI_VERSION:=2.1.15}
 
 for V in VERSION DOCKER_REPOSITORY HOSTNAME CONTAINER_NS AAF_FQDN AAF_FQDN_IP DEPLOY_FQI APP_FQDN APP_FQI VOLUME DRIVER LATITUDE LONGITUDE; do
    if [ "$(grep $V ./aaf.props)" = "" ]; then

diff --git a/auth/docker/dbuild.sh b/auth/docker/dbuild.sh
old mode 100755 (executable)
new mode 100644 (file)
index a2a17e6..0a81646
--- a/auth/docker/dbuild.sh
+++ b/auth/docker/dbuild.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+
 #########
 #  ============LICENSE_START====================================================
 #  org.onap.aaf
@@ -28,6 +28,9 @@ fi
 
 . ./d.props
 
+# Remove "SNAPSHOT" from AAF Jars in Containers
+JAR_VERSION=${VERSION/-SNAPSHOT/}
+
 # process input. originally, an optional positional parameter is used to designate a component.
 # A flagged parameter has been added to optionally indicate docker pull registry. Ideally, options
 # would be flagged but we're avoiding ripple effect of changing original usage
@@ -53,6 +56,7 @@ DOCKER=${DOCKER:=docker}
 
 echo "Building Containers for aaf components, version $VERSION"
 # AAF_cass now needs a version...
+echo "### Build Cass"
 cd ../auth-cass/docker
 pwd
 bash ./dbuild.sh $DOCKER_PULL_REGISTRY
@@ -60,7 +64,9 @@ cd -
 
 ########
 # First, build a AAF Base version - set the core image, etc
+echo "### Build Base"
 sed -e 's/${AAF_VERSION}/'${VERSION}'/g' \
+    -e 's/${JAR_VERSION}/'${JAR_VERSION}'/g' \
     -e 's/${DUSER}/'${DUSER}'/g' \
     -e 's/${REGISTRY}/'${DOCKER_PULL_REGISTRY}'/g' \
     Dockerfile.base > Dockerfile
@@ -69,12 +75,13 @@ $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
 
-# Tack the "SNAPSHOT" out of name
 function SCP() {
   SANS=${1/-SNAPSHOT/}
+  echo $1 = $SANS
   if [ -e $SANS ]; then
     cp $SANS $2
   else 
+
     ln $1 $SANS
     cp $SANS $2
     rm $SANS
@@ -92,7 +99,9 @@ SCP ../cadi/servlet-sample/target/aaf-cadi-servlet-sample-${VERSION}-sample.jar
 cp -Rf ../conf/CA sample
 
 # AAF Config image (for AAF itself)
+echo "### Build Config"
 sed -e 's/${AAF_VERSION}/'${VERSION}'/g' \
+    -e 's/${JAR_VERSION}/'${JAR_VERSION}'/g' \
     -e 's/${AAF_COMPONENT}/'${AAF_COMPONENT}'/g' \
     -e 's/${DOCKER_REPOSITORY}/'${DOCKER_REPOSITORY}'/g' \
     -e 's/${DUSER}/'${DUSER}'/g' \
@@ -103,7 +112,9 @@ $DOCKER tag ${ORG}/${PROJECT}/aaf_config:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/
 
 
 # AAF Agent Image (for Clients)
+echo "### Build Agent"
 sed -e 's/${AAF_VERSION}/'${VERSION}'/g' \
+    -e 's/${JAR_VERSION}/'${JAR_VERSION}'/g' \
     -e 's/${AAF_COMPONENT}/'${AAF_COMPONENT}'/g' \
     -e 's/${DOCKER_REPOSITORY}/'${DOCKER_REPOSITORY}'/g' \
     -e 's/${DUSER}/'${DUSER}'/g' \
@@ -117,45 +128,80 @@ rm sample/Dockerfile sample/bin/aaf-*-*.jar
 rm -Rf sample/CA
 cd -
 
+
+########
+# Third Copy AAF Executables to a BUILD Directory, for easy Cleanup
+echo "### Copy to aaf_DBUILD"
+if [ -e "../aaf_$VERSION" ]; then
+  cp -Rf ../aaf_$VERSION ../aaf_DBUILD
+elif [ -e "../aaf_$JAR_VERSION" ]; then
+  cp -Rf ../aaf_$JAR_VERSION ../aaf_DBUILD
+else
+  echo "ERROR: No AAF Built.  use Maven"
+  exit
+fi
+if [ ! "$VERSION" = "$JAR_VERSION" ]; then 
+  START_DIR=$(pwd)
+  # Convert SNAPSHOT issues
+  cp -Rf ../aaf_$VERSION ../aaf_DBUILD
+  cd ../aaf_DBUILD/lib
+  # If Built Jars are "SNAPSHOT", convert to NON SNAPSHOT
+  for J in $(ls *-SNAPSHOT*); do mv $J ${J/-SNAPSHOT/}; done
+  cd ../bin
+  rm *.bat
+  for S in $(ls); do
+     sed -e "/$VERSION/s/$VERSION/$JAR_VERSION/g" $S > tmp
+     mv tmp $S
+  done
+  cd ${START_DIR}
+fi
+
 ########
 # 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
+cp ../sample/bin/pod_wait.sh  ../aaf_DBUILD/bin
 # Apply currrent Properties to Docker file, and put in place.
 sed -e 's/${AAF_VERSION}/'${VERSION}'/g' \
+    -e 's/${JAR_VERSION}/'${JAR_VERSION}'/g' \
     -e 's/${AAF_COMPONENT}/'${AAF_COMPONENT}'/g' \
     -e 's/${DOCKER_REPOSITORY}/'${DOCKER_REPOSITORY}'/g' \
     -e 's/${DUSER}/'${DUSER}'/g' \
-    Dockerfile.core >../aaf_${VERSION}/Dockerfile
+    Dockerfile.core >../aaf_DBUILD/Dockerfile
 cd ..
-echo "#######"
-pwd
-echo "#######"
-$DOCKER build -t ${ORG}/${PROJECT}/aaf_core:${VERSION} aaf_${VERSION}
+
+echo "### Building Core"
+# Don't need "Hello" App in core
+mv aaf_DBUILD/lib/aaf-auth-hello-${JAR_VERSION}* /tmp
+
+$DOCKER build -t ${ORG}/${PROJECT}/aaf_core:${VERSION} aaf_DBUILD
 $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
+rm aaf_DBUILD/Dockerfile
+mv /tmp/aaf-auth-hello-${JAR_VERSION}* aaf_DBUILD/lib
 
 ########
 # Fourth, do Hello
 # Apply currrent Properties to Docker file, and put in place.
+echo "### Building Hello"
 cd -
 sed -e 's/${AAF_VERSION}/'${VERSION}'/g' \
+    -e 's/${JAR_VERSION}/'${JAR_VERSION}'/g' \
     -e 's/${DOCKER_REPOSITORY}/'${DOCKER_REPOSITORY}'/g' \
     -e 's/${DUSER}/'${DUSER}'/g' \
-    Dockerfile.hello >../aaf_${VERSION}/Dockerfile
+    Dockerfile.hello >../aaf_DBUILD/Dockerfile
 cd ..
-echo "#######"
-pwd
-echo "#######"
-cp -Rf sample/etc aaf_${VERSION}
-cp -Rf sample/logs aaf_${VERSION}
-$DOCKER build -t ${ORG}/${PROJECT}/aaf_hello:${VERSION} aaf_${VERSION}
+
+cp -Rf sample/etc aaf_DBUILD
+cp -Rf sample/logs aaf_DBUILD
+
+for C in cass certman cmd deforg fs gui locate oauth service; do
+   rm aaf_DBUILD/lib/aaf-auth-$C-*
+done
+
+$DOCKER build -t ${ORG}/${PROJECT}/aaf_hello:${VERSION} aaf_DBUILD
 $DOCKER tag ${ORG}/${PROJECT}/aaf_hello:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_hello:${VERSION}
 $DOCKER tag ${ORG}/${PROJECT}/aaf_hello:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_hello:latest
-rm -Rf aaf_${VERSION}/Dockerfile aaf_${VERSION}/etc
 
 # Final cleanup
-rm aaf_${VERSION}/bin/pod_wait.sh
+rm -Rf aaf_DBUILD
 
 cd -

diff --git a/auth/docker/pom.xml b/auth/docker/pom.xml
index 46ff63a..fb31fbf 100644 (file)
--- a/auth/docker/pom.xml
+++ b/auth/docker/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>authparent</artifactId>
-        <version>2.1.15-SNAPSHOT</version>
+        <version>2.1.15</version>
         <relativePath>../pom.xml</relativePath>
     </parent>