Commit215234e

committed

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

1 parent09fcbdc commit215234eCopy full SHA for 215234e

File tree

-3

lines changed

-3

lines changed

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@ RUN if [ "${CHECK_CODE}" = "cppcheck" ] ; then \`
`14`	`14`	`RUN if [ "${CHECK_CODE}" = "false" ] ; then \`
`15`	`15`	`echo 'http://dl-3.alpinelinux.org/alpine/edge/main' > /etc/apk/repositories; \`
`16`	`16`	`apk --no-cache add curl python3 gcc make musl-dev cmocka-dev;\`
`17`		`-pip3 install testgres; \`
`18`	`17`	`fi`
`19`	`18`
`20`	`19`	`RUN mkdir -p /pg/data && \`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`#!/usr/bin/env python`
`2`	`2`
`3`	`3`	`importsubprocess`
	`4`	`+importgetpass`
`4`	`5`
`5`	`6`	`DOCKER_ID='pathman'`
`6`	`7`	`pg_versions= ['9.5','9.6','10']`
`@@ -17,11 +18,12 @@`
`17`	`18`	`}`
`18`	`19`	`}`
`19`	`20`
`20`		-password=input("Enter password for `docker login` for user `%s`: "%DOCKER_ID)
	`21`	+user=input("Enter username for `docker login`: ")
	`22`	`+password=getpass.getpass()`
`21`	`23`	`subprocess.check_output([`
`22`	`24`	`'docker',`
`23`	`25`	`'login',`
`24`		`-'-u',DOCKER_ID,`
	`26`	`+'-u',user,`
`25`	`27`	`'-p',password])`
`26`	`28`
`27`	`29`	`travis_conf_line='- DOCKER_IMAGE=%s'`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,10 @@ elif [ "$CHECK_CODE" = "cppcheck" ]; then`
`35`	`35`	`exit$status`
`36`	`36`	`fi`
`37`	`37`
	`38`	`+# we need testgres for pathman tests`
	`39`	`+pip3 install testgres`
	`40`	`+pip3 freeze\| grep testgres`
	`41`	`+`
`38`	`42`	`# don't forget to "make clean"`
`39`	`43`	`make USE_PGXS=1 clean`
`40`	`44`

Comments

(0)