[trafficcontrol] 13/20: move adduser.pl to where docker can pick up

[de...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dewrich pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git

commit 48241e03b5c4c40e40579c68c6bfb79a8736c353
Author: Dan Kirkwood <da...@gmail.com>
AuthorDate: Mon Jun 11 19:07:50 2018 +0000

    move adduser.pl to where docker can pick up
---
 infrastructure/cdn-in-a-box/traffic_ops/Dockerfile                      | 1 +
 .../app/db => infrastructure/cdn-in-a-box/traffic_ops}/adduser.pl       | 0
 infrastructure/cdn-in-a-box/traffic_ops/run.sh                          | 2 +-
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile b/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile
index d67b039..437ec3c 100644
--- a/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile
+++ b/infrastructure/cdn-in-a-box/traffic_ops/Dockerfile
@@ -66,6 +66,7 @@ WORKDIR /opt/traffic_ops/app
 ENV MOJO_MODE production
 ADD profile.origin.traffic_ops /
 
+ADD adduser.pl /
 ADD config.sh /
 ADD run.sh /
 CMD /run.sh
diff --git a/traffic_ops/app/db/adduser.pl b/infrastructure/cdn-in-a-box/traffic_ops/adduser.pl
similarity index 100%
rename from traffic_ops/app/db/adduser.pl
rename to infrastructure/cdn-in-a-box/traffic_ops/adduser.pl
diff --git a/infrastructure/cdn-in-a-box/traffic_ops/run.sh b/infrastructure/cdn-in-a-box/traffic_ops/run.sh
index d4b23e3..7897d02 100755
--- a/infrastructure/cdn-in-a-box/traffic_ops/run.sh
+++ b/infrastructure/cdn-in-a-box/traffic_ops/run.sh
@@ -66,7 +66,7 @@ cd $TO_DIR && \
 	./db/admin.pl --env=production reset && \
 	./db/admin.pl --env=production seed || echo "db setup failed!"
 
-./db/adduser.pl $TO_ADMIN_USER $TO_ADMIN_PASSWORD admin | psql -U$DB_USER -h$DB_SERVER $DB_NAME || echo "adding traffic_ops admin user failed!"
+/adduser.pl $TO_ADMIN_USER $TO_ADMIN_PASSWORD admin | psql -U$DB_USER -h$DB_SERVER $DB_NAME || echo "adding traffic_ops admin user failed!"
 
 cd $TO_DIR && $TO_DIR/local/bin/hypnotoad script/cdn
 exec tail -f /var/log/traffic_ops/traffic_ops.log

-- 
To stop receiving notification emails like this one, please contact
dewrich@apache.org.