Add all images to travis

ildus · ildus · commit f633bce04e58 · 2017-07-19T14:55:59.000+03:00
diff --git a/.travis.yml b/.travis.yml
@@ -18,3 +18,11 @@ script:
 
 env:
     - DOCKER_IMAGE=pathman/pg95_clang_check_code
+    - DOCKER_IMAGE=pathman/pg95_cppcheck
+    - DOCKER_IMAGE=pathman/pg95_pathman_tests
+    - DOCKER_IMAGE=pathman/pg96_clang_check_code
+    - DOCKER_IMAGE=pathman/pg96_cppcheck
+    - DOCKER_IMAGE=pathman/pg96_pathman_tests
+    - DOCKER_IMAGE=pathman/pg10_clang_check_code
+    - DOCKER_IMAGE=pathman/pg10_cppcheck
+    - DOCKER_IMAGE=pathman/pg10_pathman_tests
diff --git a/make_images.py b/make_images.py
@@ -17,26 +17,23 @@
 	}
 }
 
-stopline = '###STOP'
-
-password = input("Enter password for `docker login`: ")
+password = input("Enter password for `docker login` for user `%s`: " % DOCKER_ID)
 subprocess.check_output([
 	'docker',
 	'login',
 	'-u', DOCKER_ID,
 	'-p', password])
 
+travis_conf_line = '- DOCKER_IMAGE=%s'
+travis_conf = []
+
 for pg_version in pg_versions:
 	pgname = 'pg%s' % pg_version.replace('.', '')
 	for key, variables in image_types.items():
 		image_name = '%s/%s_%s' % (DOCKER_ID, pgname, key)
 		with open('Dockerfile', 'w') as out:
 			with open('Dockerfile.tmpl', 'r') as f:
 				for line in f:
-					if line.startswith(stopline):
-						break
-
-					line = line
 					line = line.replace('${PG_VERSION}', pg_version)
 					for key, value in variables.items():
 						varname = '${%s}' % key
@@ -55,4 +52,6 @@
 		subprocess.check_output(['docker', 'push', image_name],
 				stderr=subprocess.STDOUT)
 		print("upload ok:", image_name)
-		exit()
+		travis_conf.append(travis_conf_line % image_name)
+
+print('\n'.join(travis_conf))
