Adjust Docker Build

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

diff --git a/auth/docker/Dockerfile.ms b/auth/docker/Dockerfile.ms
index 99ac5fc..1eee1ee 100644 (file)
--- a/auth/docker/Dockerfile.ms
+++ b/auth/docker/Dockerfile.ms
@@ -23,8 +23,8 @@ ENV VERSION=${AAF_VERSION}
 
 LABEL description="aaf_${AAF_COMPONENT}"
 LABEL version=${AAF_VERSION}
-
-COPY pod/* /opt/app/aaf/pod/
+ 
+COPY bin/pod_wait.sh /opt/app/aaf/bin/
 
 #CMD ["bash","-c","cd /opt/app/aaf;bin/${AAF_COMPONENT}"]
 CMD []

diff --git a/auth/docker/dpush.sh b/auth/docker/dpush.sh
index 376ff33..f9f674f 100644 (file)
--- a/auth/docker/dpush.sh
+++ b/auth/docker/dpush.sh
@@ -24,13 +24,13 @@
 . ./d.props
 DOCKER=${DOCKER:=docker}
 
-AAF_COMPONENTS="config agent core cass $(cat components) "
+AAF_COMPONENTS="config agent base core cass $(cat components) "
 
 for AAF_COMPONENT in ${AAF_COMPONENTS}; do
-        # docker push ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf-${AAF_COMPONENT}:${OLD_VERSION}
-        $DOCKER push ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf-${AAF_COMPONENT}:${VERSION}
-        docker tag ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf-${AAF_COMPONENT}:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf-${AAF_COMPONENT}:${VERSION}-latest
-        docker tag ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf-${AAF_COMPONENT}:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf-${AAF_COMPONENT}:latest
-               $DOCKER push ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf-${AAF_COMPONENT}:${VERSION}-latest
-               $DOCKER push ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf-${AAF_COMPONENT}:latest
+        # docker push ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_AAF_COMPONENT}:${OLD_VERSION}
+        $DOCKER push ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_AAF_COMPONENT}:${VERSION}
+        docker tag ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_AAF_COMPONENT}:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_AAF_COMPONENT}:${VERSION}-latest
+        docker tag ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_AAF_COMPONENT}:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_AAF_COMPONENT}:latest
+               $DOCKER push ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_AAF_COMPONENT}:${VERSION}-latest
+               $DOCKER push ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_AAF_COMPONENT}:latest
 done

diff --git a/auth/docker/drun.sh b/auth/docker/drun.sh
index ed62e57..cdd8b3c 100644 (file)
--- a/auth/docker/drun.sh
+++ b/auth/docker/drun.sh
@@ -42,9 +42,9 @@ for AAF_COMPONENT in ${AAF_COMPONENTS}; do
     "service")
         PUBLISH="--publish 8100:8100"
         if [ -z "$CASSANDRA_DOCKER" ]; then
-         CMD_LINE="cd /opt/app/aaf && /bin/bash pod/pod_wait.sh aaf-service && exec bin/service"
+         CMD_LINE="cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-service && exec bin/service"
         else
-         CMD_LINE="cd /opt/app/aaf && /bin/bash pod/pod_wait.sh aaf-service aaf-cass && exec bin/service"
+         CMD_LINE="cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-service aaf-cass && exec bin/service"
           LINKS="--link $CASSANDRA_DOCKER"
          echo $CASSANDRA_CLUSTER
         fi
@@ -52,32 +52,32 @@ for AAF_COMPONENT in ${AAF_COMPONENTS}; do
     "locate")
         PUBLISH="--publish 8095:8095"
         LINKS="--link aaf-cass --link aaf-service"
-       CMD_LINE="cd /opt/app/aaf && /bin/bash pod/pod_wait.sh aaf-locate aaf-service && exec bin/locate"
+       CMD_LINE="cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-locate aaf-service && exec bin/locate"
         ;;
     "oauth")
         PUBLISH="--publish 8140:8140"
         LINKS="--link aaf-cass --link aaf-service --link aaf-locate"
-       CMD_LINE="cd /opt/app/aaf && /bin/bash pod/pod_wait.sh aaf-oauth aaf-service && exec bin/oauth"
+       CMD_LINE="cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-oauth aaf-service && exec bin/oauth"
         ;;
     "cm")
         PUBLISH="--publish 8150:8150"
         LINKS="--link aaf-cass --link aaf-service --link aaf-locate"
-       CMD_LINE="cd /opt/app/aaf && /bin/bash pod/pod_wait.sh aaf-cm aaf-locate && exec bin/cm"
+       CMD_LINE="cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-cm aaf-locate && exec bin/cm"
         ;;
     "gui")
         PUBLISH="--publish 8200:8200"
         LINKS="--link aaf-service --link aaf-locate --link aaf-oauth --link aaf-cm"
-       CMD_LINE="cd /opt/app/aaf && /bin/bash pod/pod_wait.sh aaf-gui aaf-locate && exec bin/gui"
+       CMD_LINE="cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-gui aaf-locate && exec bin/gui"
         ;;
     "fs")
         PUBLISH="--publish 80:8096"
         LINKS=""
-       CMD_LINE="cd /opt/app/aaf && /bin/bash pod/pod_wait.sh aaf-fs aaf-locate && exec bin/fs"
+       CMD_LINE="cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-fs aaf-locate && exec bin/fs"
         ;;
     "hello")
         PUBLISH="--publish 8130:8130"
         LINKS="--link aaf-service --link aaf-locate --link aaf-oauth --link aaf-cm"
-       CMD_LINE="cd /opt/app/aaf && /bin/bash pod/pod_wait.sh aaf-hello aaf-locate && exec bin/hello"
+       CMD_LINE="cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-hello aaf-locate && exec bin/hello"
         ;;
     esac