Ask user login in make_images script. Remove testgres installation from container

ildus · ildus · commit 215234e5ca1d · 2017-07-21T13:20:59.000+03:00
diff --git a/Dockerfile.tmpl b/Dockerfile.tmpl
@@ -14,7 +14,6 @@ RUN if [ "${CHECK_CODE}" = "cppcheck" ] ; then \
 RUN if [ "${CHECK_CODE}" = "false" ] ; then \
 	echo 'http://dl-3.alpinelinux.org/alpine/edge/main' > /etc/apk/repositories; \
 	apk --no-cache add curl python3 gcc make musl-dev cmocka-dev;\
-	pip3 install testgres; \
 	fi
 
 RUN mkdir -p /pg/data && \
diff --git a/make_images.py b/make_images.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 
 import subprocess
+import getpass
 
 DOCKER_ID = 'pathman'
 pg_versions = ['9.5','9.6','10']
@@ -17,11 +18,12 @@
 	}
 }
 
-password = input("Enter password for `docker login` for user `%s`: " % DOCKER_ID)
+user = input("Enter username for `docker login`: ")
+password = getpass.getpass()
 subprocess.check_output([
 	'docker',
 	'login',
-	'-u', DOCKER_ID,
+	'-u', user,
 	'-p', password])
 
 travis_conf_line = '- DOCKER_IMAGE=%s'
diff --git a/run_tests.sh b/run_tests.sh
@@ -35,6 +35,10 @@ elif [ "$CHECK_CODE" = "cppcheck" ]; then
     exit $status
 fi
 
+# we need testgres for pathman tests
+pip3 install testgres
+pip3 freeze | grep testgres
+
 # don't forget to "make clean"
 make USE_PGXS=1 clean
 
