File tree Expand file tree Collapse file tree 2 files changed +15
-8
lines changed Expand file tree Collapse file tree 2 files changed +15
-8
lines changed Original file line number Diff line number Diff line change @@ -18,3 +18,11 @@ script:
1818
1919env :
2020 - DOCKER_IMAGE=pathman/pg95_clang_check_code
21+ - DOCKER_IMAGE=pathman/pg95_cppcheck
22+ - DOCKER_IMAGE=pathman/pg95_pathman_tests
23+ - DOCKER_IMAGE=pathman/pg96_clang_check_code
24+ - DOCKER_IMAGE=pathman/pg96_cppcheck
25+ - DOCKER_IMAGE=pathman/pg96_pathman_tests
26+ - DOCKER_IMAGE=pathman/pg10_clang_check_code
27+ - DOCKER_IMAGE=pathman/pg10_cppcheck
28+ - DOCKER_IMAGE=pathman/pg10_pathman_tests
Original file line number Diff line number Diff line change 1717 }
1818}
1919
20- stopline = '###STOP'
21-
22- password = input ("Enter password for `docker login`: " )
20+ password = input ("Enter password for `docker login` for user `%s`: " % DOCKER_ID )
2321subprocess .check_output ([
2422 'docker' ,
2523 'login' ,
2624 '-u' , DOCKER_ID ,
2725 '-p' , password ])
2826
27+ travis_conf_line = '- DOCKER_IMAGE=%s'
28+ travis_conf = []
29+
2930for pg_version in pg_versions :
3031 pgname = 'pg%s' % pg_version .replace ('.' , '' )
3132 for key , variables in image_types .items ():
3233 image_name = '%s/%s_%s' % (DOCKER_ID , pgname , key )
3334 with open ('Dockerfile' , 'w' ) as out :
3435 with open ('Dockerfile.tmpl' , 'r' ) as f :
3536 for line in f :
36- if line .startswith (stopline ):
37- break
38-
39- line = line
4037 line = line .replace ('${PG_VERSION}' , pg_version )
4138 for key , value in variables .items ():
4239 varname = '${%s}' % key
5552 subprocess .check_output (['docker' , 'push' , image_name ],
5653 stderr = subprocess .STDOUT )
5754 print ("upload ok:" , image_name )
58- exit ()
55+ travis_conf .append (travis_conf_line % image_name )
56+
57+ print ('\n ' .join (travis_conf ))
You can’t perform that action at this time.
0 commit comments