summaryrefslogtreecommitdiffstats
path: root/auth/docker
diff options
context:
space:
mode:
Diffstat (limited to 'auth/docker')
-rw-r--r--auth/docker/Dockerfile.agent3
-rw-r--r--auth/docker/Dockerfile.hello3
-rw-r--r--auth/docker/aaf.sh4
-rw-r--r--auth/docker/agent.sh1
-rwxr-xr-xauth/docker/dbuild.sh8
-rw-r--r--auth/docker/drun.sh15
6 files changed, 17 insertions, 17 deletions
diff --git a/auth/docker/Dockerfile.agent b/auth/docker/Dockerfile.agent
index 669665cc..20406a46 100644
--- a/auth/docker/Dockerfile.agent
+++ b/auth/docker/Dockerfile.agent
@@ -26,9 +26,8 @@ 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-aaf-${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 chmod 755 /opt/app/aaf_config/bin/* &&\
if [ -n "${DUSER}" ]; then chown -R ${DUSER}:${DUSER} /opt/app/aaf_config; fi
diff --git a/auth/docker/Dockerfile.hello b/auth/docker/Dockerfile.hello
index 2378bae0..4b12a6f1 100644
--- a/auth/docker/Dockerfile.hello
+++ b/auth/docker/Dockerfile.hello
@@ -26,8 +26,9 @@ LABEL version=${AAF_VERSION}
COPY bin/pod_wait.sh /opt/app/aaf/bin/
COPY lib /opt/app/aaf/lib
-COPY etc /opt/app/osaaf/etc
COPY bin/hello /opt/app/aaf/bin/
+COPY etc /opt/app/aaf/etc
+COPY logs /opt/app/aaf/logs
RUN mkdir -p /opt/app/osaaf &&\
mkdir -p /opt/app/aaf/status &&\
diff --git a/auth/docker/aaf.sh b/auth/docker/aaf.sh
index 23822e52..b498428b 100644
--- a/auth/docker/aaf.sh
+++ b/auth/docker/aaf.sh
@@ -25,6 +25,9 @@ DOCKER=${DOCKER:=docker}
# if something, may not want CASS attached all the tim
#LINKS="--link $CASSANDRA_DOCKER"
+# DOCKER doesn't have DNS out of the box, only links.
+# so we add cm_always_ignore_ips in --env
+
function run_it() {
if [ -n "${DUSER}" ]; then
USER_LINE="--user ${DUSER}"
@@ -39,6 +42,7 @@ function run_it() {
--env aaf_locator_fqdn=${HOSTNAME} \
--env aaf_locate_url=https://aaf-locate:8095 \
--env aaf_locator_public_fqdn=${HOSTNAME} \
+ --env cm_always_ignore_ips=true \
--env AAF_ENV=${AAF_ENV} \
--env LATITUDE=${LATITUDE} \
--env LONGITUDE=${LONGITUDE} \
diff --git a/auth/docker/agent.sh b/auth/docker/agent.sh
index b0ae3fd0..32910874 100644
--- a/auth/docker/agent.sh
+++ b/auth/docker/agent.sh
@@ -121,6 +121,7 @@ function run_it() {
--env LONGITUDE=${LONGITUDE} \
--env aaf_locator_container_ns=${CONTAINER_NS} \
--env aaf_locator_container=docker \
+ --link aaf-service --link aaf-locate --link aaf-oauth --link aaf-cm \
--name aaf-agent-$USER \
"$PREFIX"onap/aaf/aaf_agent:$VERSION \
bash -c "bash /opt/app/aaf_config/bin/agent.sh $PARAMS"
diff --git a/auth/docker/dbuild.sh b/auth/docker/dbuild.sh
index 3b764547..3094eab9 100755
--- a/auth/docker/dbuild.sh
+++ b/auth/docker/dbuild.sh
@@ -72,8 +72,11 @@ rm Dockerfile
########
# Second, Create the AAF Config (Security) Images
cd ..
+# Note: only 2 jars each in Agent/Config
cp auth-cmd/target/aaf-auth-cmd-$VERSION-full.jar sample/bin
cp auth-batch/target/aaf-auth-batch-$VERSION-full.jar sample/bin
+cp ../cadi/aaf/target/aaf-cadi-aaf-${VERSION}-full.jar sample/bin
+cp ../cadi/servlet-sample/target/aaf-cadi-servlet-sample-${VERSION}-sample.jar sample/bin
cp -Rf ../conf/CA sample
# AAF Config image (for AAF itself)
@@ -86,7 +89,7 @@ $DOCKER build -t ${ORG}/${PROJECT}/aaf_config:${VERSION} sample
$DOCKER tag ${ORG}/${PROJECT}/aaf_config:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_config:${VERSION}
$DOCKER tag ${ORG}/${PROJECT}/aaf_config:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_config:latest
-cp ../cadi/servlet-sample/target/aaf-cadi-servlet-sample-${VERSION}-sample.jar sample/bin
+
# AAF Agent Image (for Clients)
sed -e 's/${AAF_VERSION}/'${VERSION}'/g' \
-e 's/${AAF_COMPONENT}/'${AAF_COMPONENT}'/g' \
@@ -98,7 +101,7 @@ $DOCKER tag ${ORG}/${PROJECT}/aaf_agent:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/$
$DOCKER tag ${ORG}/${PROJECT}/aaf_agent:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_agent:latest
# Clean up
-rm sample/Dockerfile sample/bin/aaf-*-${VERSION}-full.jar sample/bin/aaf-cadi-servlet-sample-${VERSION}-sample.jar
+rm sample/Dockerfile sample/bin/aaf-*-${VERSION}*.jar
rm -Rf sample/CA
cd -
@@ -134,6 +137,7 @@ 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}
$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
diff --git a/auth/docker/drun.sh b/auth/docker/drun.sh
index 03d8e9cd..57a61676 100644
--- a/auth/docker/drun.sh
+++ b/auth/docker/drun.sh
@@ -61,7 +61,7 @@ for AAF_COMPONENT in ${AAF_COMPONENTS}; do
;;
"cm")
PUBLISH="--publish 8150:8150"
- LINKS="--link aaf-cass --link aaf-service --link aaf-locate"
+ LINKS="--link aaf-cass --link aaf-service --link aaf-locate --link aaf-oauth"
CMD_LINE="cd /opt/app/aaf && /bin/bash bin/pod_wait.sh aaf-cm aaf-locate && exec bin/cm"
;;
"gui")
@@ -82,20 +82,11 @@ for AAF_COMPONENT in ${AAF_COMPONENTS}; do
esac
echo Starting aaf-$AAF_COMPONENT...
-
- #for A in aaf.osaaf.org $AH_ROOT; do
- #ADD_HOST="$ADD_HOST --add-host=$A:$HOST_IP"
- #done
-
- #if [ ! -z "$LINKS" ] && [[ "$CASS_HOST" =~ ":" ]]; then
- #ADD_HOST="$ADD_HOST --add-host=$CASS_HOST"
- #fi
- #--hostname="${AAF_COMPONENT}.${NAMESPACE}" \
- # --env aaf_locate_url=https://aaf-locate:8095 \
- # $ADD_HOST \
if [ -n "${DUSER}" ]; then
THE_USER="--user $DUSER"
fi
+
+
$DOCKER run \
-d \
${THE_USER} \