Mercurial > public > ssdt-docker
changeset 158:4bc3485f8460
merge
| author | smith@nwoca.org |
|---|---|
| date | Mon, 31 Jul 2017 20:50:14 +0100 |
| parents | 018f62da1931 (diff) 570e192c21b4 (current diff) |
| children | 303259c08b7d |
| files | pilot/import-usas.sh pilot/import-usps.sh |
| diffstat | 4 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/.functions.sh Fri Jul 21 11:01:26 2017 -0400 +++ b/scripts/.functions.sh Mon Jul 31 20:50:14 2017 +0100 @@ -11,6 +11,8 @@ export SSDT_HOME=$(dirname $SSDT_SCRIPTS) fi +export SSDT_DOCKER_VERSION=$(docker version --format '{{.Server.Version}}') + # deletes psql data from specified service resetDbVolume() { # Works for named and unnamed volumes and custom $PGDATA.
--- a/scripts/updates-pull.sh Fri Jul 21 11:01:26 2017 -0400 +++ b/scripts/updates-pull.sh Mon Jul 31 20:50:14 2017 +0100 @@ -18,7 +18,7 @@ do repo=${line[0]} tag=${line[1]} - if [[ $repo == docker.ssdt.io* ]] + if [[ $repo == docker.ssdt.io* && $tag != *none* ]] then echo "docker pull ${repo}:${tag}" docker pull ${repo}:${tag}
--- a/tomcat/Dockerfile Fri Jul 21 11:01:26 2017 -0400 +++ b/tomcat/Dockerfile Mon Jul 31 20:50:14 2017 +0100 @@ -1,4 +1,4 @@ -FROM tomcat:8.5.16-jre8 +FROM tomcat:8.5.14-jre8 MAINTAINER Dave Smith <smith@nwoca.org>
--- a/tomcat/tomcat-users.xml Fri Jul 21 11:01:26 2017 -0400 +++ b/tomcat/tomcat-users.xml Mon Jul 31 20:50:14 2017 +0100 @@ -5,5 +5,7 @@ version="1.0"> <role rolename="manager-gui"/> <role rolename="manager-jmx"/> + <role rolename="manager-script"/> <user username="admin" password="99admin00" roles="manager-gui,manager-jmx"/> + <user username="script" password="99admin00" roles="manager-script"/> </tomcat-users> \ No newline at end of file