Skip to content

Commit f633bce

Browse files
committed
Add all images to travis
1 parent 3a8bcf8 commit f633bce

File tree

2 files changed

+15
-8
lines changed

2 files changed

+15
-8
lines changed

.travis.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,11 @@ script:
1818

1919
env:
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

make_images.py

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,23 @@
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)
2321
subprocess.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+
2930
for 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
@@ -55,4 +52,6 @@
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))

0 commit comments

Comments
 (0)