diff options
| -rw-r--r-- | auth/docker/.gitignore | 1 | ||||
| -rw-r--r-- | auth/docker/Dockerfile.core | 2 | ||||
| -rw-r--r-- | auth/docker/Dockerfile.ms | 2 | ||||
| -rw-r--r-- | auth/docker/cass.props.init | 3 | ||||
| -rw-r--r-- | auth/docker/d.props.init | 1 | ||||
| -rwxr-xr-x | auth/docker/dbuild.sh | 1 | ||||
| -rw-r--r-- | auth/docker/dpush.sh | 4 | ||||
| -rw-r--r-- | auth/docker/drun.sh | 9 |
8 files changed, 18 insertions, 5 deletions
diff --git a/auth/docker/.gitignore b/auth/docker/.gitignore index f644e05c..47b48da5 100644 --- a/auth/docker/.gitignore +++ b/auth/docker/.gitignore @@ -1,3 +1,4 @@ /local /d.props /aaf.props +/cass.props diff --git a/auth/docker/Dockerfile.core b/auth/docker/Dockerfile.core index c4e8a461..b54dce77 100644 --- a/auth/docker/Dockerfile.core +++ b/auth/docker/Dockerfile.core @@ -7,4 +7,6 @@ LABEL version=${AAF_VERSION} COPY lib /opt/app/aaf/lib COPY bin /opt/app/aaf/bin +COPY theme /opt/app/aaf/theme + diff --git a/auth/docker/Dockerfile.ms b/auth/docker/Dockerfile.ms index b8ef6d9a..121bd06c 100644 --- a/auth/docker/Dockerfile.ms +++ b/auth/docker/Dockerfile.ms @@ -5,8 +5,6 @@ ENV VERSION=${AAF_VERSION} LABEL description="aaf_${AAF_COMPONENT}" LABEL version=${AAF_VERSION} -COPY theme /opt/app/aaf/theme - CMD ["/bin/bash","-c","/opt/app/aaf/bin/${AAF_COMPONENT}"] # For Debugging installation diff --git a/auth/docker/cass.props.init b/auth/docker/cass.props.init new file mode 100644 index 00000000..fc9bab43 --- /dev/null +++ b/auth/docker/cass.props.init @@ -0,0 +1,3 @@ +#!/bin/bash + +CASS_HOST=cass.aaf.osaaf.org:<Cass IP> diff --git a/auth/docker/d.props.init b/auth/docker/d.props.init index b0ba63d8..54a83b71 100644 --- a/auth/docker/d.props.init +++ b/auth/docker/d.props.init @@ -8,7 +8,6 @@ CONF_ROOT_DIR=/opt/app/osaaf # Local Env info HOSTNAME=aaf.osaaf.org HOST_IP= -CASS_HOST=cass.aaf.osaaf.org:<Cass IP> # AAF Machine info AAF_ENV=DEV diff --git a/auth/docker/dbuild.sh b/auth/docker/dbuild.sh index da0b9b64..e3d49429 100755 --- a/auth/docker/dbuild.sh +++ b/auth/docker/dbuild.sh @@ -45,6 +45,7 @@ for AAF_COMPONENT in ${AAF_COMPONENTS}; do sed -e 's/${AAF_VERSION}/'${VERSION}'/g' -e 's/${AAF_COMPONENT}/'${AAF_COMPONENT}'/g' Dockerfile.ms >../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} rm aaf_${VERSION}/Dockerfile cd - done diff --git a/auth/docker/dpush.sh b/auth/docker/dpush.sh index 761ae2a8..6beae857 100644 --- a/auth/docker/dpush.sh +++ b/auth/docker/dpush.sh @@ -11,8 +11,8 @@ else fi 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}:${OLD_VERSION} docker push ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION} - docker push ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${NEW_VERSION} + # docker push ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${NEW_VERSION} done diff --git a/auth/docker/drun.sh b/auth/docker/drun.sh index c62adfc2..8cedbcc4 100644 --- a/auth/docker/drun.sh +++ b/auth/docker/drun.sh @@ -2,6 +2,15 @@ # Pull in Variables from d.props . ./d.props +# Only need Cassandra Link Info when initializing the container. +if [ ! -e ./cass.props ]; then + cp cass.props.init cass.props + echo "Edit appropriate Cassandra Link Info into cass.props" + exit +fi + +. ./cass.props + if [ "$1" == "" ]; then AAF_COMPONENTS=$(ls -r ../aaf_${VERSION}/bin | grep -v '\.') else |