Skip to content

Commit 9981bc2

Browse files
committed
Rename update.sh/target-pipeline to legacy-pipeline
Also, adjust `vars.groovy` to default to `versions-pipeline` instead now that we have a _lot_ more that are converted than we have that aren't.
1 parent 5659afe commit 9981bc2

File tree

2 files changed

+31
-70
lines changed

2 files changed

+31
-70
lines changed

update.sh/vars.groovy

Lines changed: 31 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
def defaultRepoMeta = [
44
['url', 'git@github.com:docker-library/%%REPO%%.git'],
55
['oi-fork', 'git@github.com:docker-library-bot/official-images.git'],
6-
['pipeline-script', 'update.sh/target-pipeline.groovy'],
6+
['pipeline-script', 'update.sh/versions-pipeline.groovy'],
77
['env', '.+_VERSION'], // gawk regex, anchored
88
['otherEnvs', []],
99
['branch-base', 'master'], // branch to check out from
@@ -13,91 +13,51 @@ def defaultRepoMeta = [
1313
['bot-branch', true],
1414
]
1515
def rawReposData = [
16+
['buildpack-deps', []],
1617
['busybox', [
18+
'pipeline-script': 'update.sh/legacy-pipeline.groovy',
1719
'env': 'BUSYBOX_VERSION',
1820
'update-script': 'true', // TODO determine if more can/should be done here
1921
]],
20-
['cassandra', [
21-
'pipeline-script': 'update.sh/versions-pipeline.groovy',
22-
]],
23-
['docker', [
24-
'pipeline-script': 'update.sh/versions-pipeline.groovy',
25-
]],
26-
['drupal', [
27-
'pipeline-script': 'update.sh/versions-pipeline.groovy',
28-
]],
29-
['gcc', [
30-
'pipeline-script': 'update.sh/versions-pipeline.groovy',
31-
]],
22+
['cassandra', []],
23+
['docker', []],
24+
['drupal', []],
25+
['gcc', []],
3226
['ghost', [
27+
'pipeline-script': 'update.sh/legacy-pipeline.groovy',
3328
'env': 'GHOST_VERSION',
3429
'otherEnvs': [
3530
['ghost-cli', 'GHOST_CLI_VERSION'],
3631
],
3732
]],
38-
['golang', [
39-
'pipeline-script': 'update.sh/versions-pipeline.groovy',
40-
]],
41-
['haproxy', [
42-
'pipeline-script': 'update.sh/versions-pipeline.groovy',
33+
['golang', []],
34+
['haproxy', []],
35+
['hello-world', [
36+
'pipeline-script': 'update.sh/legacy-pipeline.groovy',
37+
'update-script': 'true',
4338
]],
4439
['httpd', [
40+
'pipeline-script': 'update.sh/legacy-pipeline.groovy',
4541
'env': 'HTTPD_VERSION',
4642
'otherEnvs': [
4743
['nghttp2', 'NGHTTP2_VERSION'],
4844
['openssl', 'OPENSSL_VERSION'],
4945
],
5046
]],
51-
['julia', [
52-
'pipeline-script': 'update.sh/versions-pipeline.groovy',
53-
]],
54-
['memcached', [
55-
'pipeline-script': 'update.sh/versions-pipeline.groovy',
56-
]],
57-
['mongo', [
58-
'pipeline-script': 'update.sh/versions-pipeline.groovy',
59-
]],
60-
['mysql', [
61-
'pipeline-script': 'update.sh/versions-pipeline.groovy',
62-
]],
63-
['openjdk', [
64-
'pipeline-script': 'update.sh/versions-pipeline.groovy',
65-
]],
66-
['php', [
67-
'pipeline-script': 'update.sh/versions-pipeline.groovy',
68-
]],
69-
['postgres', [
70-
'pipeline-script': 'update.sh/versions-pipeline.groovy',
71-
]],
72-
['pypy', [
73-
'pipeline-script': 'update.sh/versions-pipeline.groovy',
74-
]],
75-
['python', [
76-
'pipeline-script': 'update.sh/versions-pipeline.groovy',
77-
]],
78-
['rabbitmq', [
79-
'pipeline-script': 'update.sh/versions-pipeline.groovy',
80-
]],
81-
['redmine', [
82-
'pipeline-script': 'update.sh/versions-pipeline.groovy',
83-
]],
84-
['ruby', [
85-
'pipeline-script': 'update.sh/versions-pipeline.groovy',
86-
]],
87-
['tomcat', [
88-
'pipeline-script': 'update.sh/versions-pipeline.groovy',
89-
]],
90-
['wordpress', [
91-
'pipeline-script': 'update.sh/versions-pipeline.groovy',
92-
]],
93-
94-
// versionless
95-
['buildpack-deps', [
96-
'pipeline-script': 'update.sh/versions-pipeline.groovy',
97-
]],
98-
['hello-world', [
99-
'update-script': 'true',
100-
]],
47+
['julia', []],
48+
['memcached', []],
49+
['mongo', []],
50+
['mysql', []],
51+
['openjdk', []],
52+
['php', []],
53+
['postgres', []],
54+
['pypy', []],
55+
['python', []],
56+
['rabbitmq', []],
57+
['redmine', []],
58+
['ruby', []],
59+
['tomcat', []],
60+
['wordpress', []],
10161

10262
// TODO it would be great to have one of these jobs per namespace ("mcr.microsoft.com/windows", "redhat", etc.)
10363
['external-pins', [
@@ -106,28 +66,29 @@ def rawReposData = [
10666

10767
// tianon
10868
['bash', [
109-
'pipeline-script': 'update.sh/versions-pipeline.groovy',
11069
'url': 'git@github.com:tianon/docker-bash.git',
11170
]],
11271
['cirros', [
72+
'pipeline-script': 'update.sh/legacy-pipeline.groovy',
11373
'url': 'git@github.com:tianon/docker-brew-cirros.git',
11474
'update-script': 'true',
11575
]],
11676
['irssi', [
77+
'pipeline-script': 'update.sh/legacy-pipeline.groovy',
11778
'url': 'git@github.com:jessfraz/irssi.git',
11879
'env': 'IRSSI_VERSION',
11980
]],
12081

12182
// pierreozoux
12283
['matomo', [
84+
'pipeline-script': 'update.sh/legacy-pipeline.groovy',
12385
'url': 'git@github.com:matomo-org/docker.git',
12486
'env': 'MATOMO_VERSION',
12587
'bot-branch': false,
12688
]],
12789

12890
// paultag
12991
['hylang', [
130-
'pipeline-script': 'update.sh/versions-pipeline.groovy',
13192
'url': 'git@github.com:hylang/docker-hylang.git',
13293
]],
13394
]

0 commit comments

Comments
 (0)