@@ -111,24 +111,28 @@ steps:
111111 type : build
112112 dockerfile : Dockerfile
113113 image-name : codefresh/cli
114+ disable_push : true
114115 tag : ${{CF_BRANCH_TAG_NORMALIZED}}
115116
116117 build_step_debian :
117118 type : build
118119 dockerfile : Dockerfile-debian
119120 image-name : codefresh/cli
121+ disable_push : true
120122 tag : ${{CF_BRANCH_TAG_NORMALIZED}}${{DEBIAN_TAG_POSTFIX}}
121123
122124 build_step_alpine_rootless :
123125 type : build
124126 dockerfile : Dockerfile-rootless
125127 image-name : codefresh/cli
128+ disable_push : true
126129 tag : ${{CF_BRANCH_TAG_NORMALIZED}}${{ROOTLESS_TAG_POSTFIX}}
127130
128131 build_step_debian_rootless :
129132 type : build
130133 dockerfile : Dockerfile-debian-rootless
131134 image-name : codefresh/cli
135+ disable_push : true
132136 tag : ${{CF_BRANCH_TAG_NORMALIZED}}${{DEBIAN_TAG_POSTFIX}}${{ROOTLESS_TAG_POSTFIX}}
133137 when :
134138 steps :
@@ -166,7 +170,9 @@ steps:
166170 push_step_alpine :
167171 stage : push
168172 type : push
169- tag : ' ${{CF_SHORT_REVISION}}'
173+ tags :
174+ - ${{CF_BRANCH_TAG_NORMALIZED}}
175+ - ${{CF_BRANCH_TAG_NORMALIZED}}-${{CF_SHORT_REVISION}}
170176 candidate : ${{build_step_alpine}}
171177 scale :
172178 push_to_dockerhub :
@@ -186,7 +192,9 @@ steps:
186192 push_step_debian :
187193 stage : push
188194 type : push
189- tag : ' ${{CF_SHORT_REVISION}}${{DEBIAN_TAG_POSTFIX}}'
195+ tags :
196+ - ${{CF_BRANCH_TAG_NORMALIZED}}${{DEBIAN_TAG_POSTFIX}}
197+ - ${{CF_BRANCH_TAG_NORMALIZED}}${{DEBIAN_TAG_POSTFIX}}-${{CF_SHORT_REVISION}}
190198 candidate : ${{build_step_debian}}
191199 scale :
192200 push_to_dockerhub_debian :
@@ -206,7 +214,9 @@ steps:
206214 push_step_alpine_rootless :
207215 stage : push
208216 type : push
209- tag : ' ${{CF_SHORT_REVISION}}${{ROOTLESS_TAG_POSTFIX}}'
217+ tags :
218+ - ${{CF_BRANCH_TAG_NORMALIZED}}${{ROOTLESS_TAG_POSTFIX}}
219+ - ${{CF_BRANCH_TAG_NORMALIZED}}${{ROOTLESS_TAG_POSTFIX}}-${{CF_SHORT_REVISION}}
210220 candidate : ${{build_step_alpine_rootless}}
211221 scale :
212222 push_to_dockerhub_rootless :
@@ -226,7 +236,9 @@ steps:
226236 push_step_debian_rootless :
227237 stage : push
228238 type : push
229- tag : ' ${{CF_SHORT_REVISION}}${{DEBIAN_TAG_POSTFIX}}${{ROOTLESS_TAG_POSTFIX}}'
239+ tags :
240+ - ${{CF_BRANCH_TAG_NORMALIZED}}${{DEBIAN_TAG_POSTFIX}}${{ROOTLESS_TAG_POSTFIX}}
241+ - ${{CF_BRANCH_TAG_NORMALIZED}}${{DEBIAN_TAG_POSTFIX}}${{ROOTLESS_TAG_POSTFIX}}-${{CF_SHORT_REVISION}}
230242 candidate : ${{build_step_debian_rootless}}
231243 scale :
232244 push_to_dockerhub_debian_rootless :
@@ -268,28 +280,28 @@ steps:
268280 ignore : [ master ]
269281 arguments :
270282 tags :
271- - ${{CF_SHORT_REVISION }}
283+ - ${{CF_BRANCH_TAG_NORMALIZED }}
272284 dev_branches_tags_debian :
273285 when :
274286 branch :
275287 ignore : [ master ]
276288 arguments :
277289 tags :
278- - ${{CF_SHORT_REVISION }}${{DEBIAN_TAG_POSTFIX}}
290+ - ${{CF_BRANCH_TAG_NORMALIZED }}${{DEBIAN_TAG_POSTFIX}}
279291 dev_branches_tags_rootless :
280292 when :
281293 branch :
282294 ignore : [ master ]
283295 arguments :
284296 tags :
285- - ${{CF_SHORT_REVISION }}${{ROOTLESS_TAG_POSTFIX}}
297+ - ${{CF_BRANCH_TAG_NORMALIZED }}${{ROOTLESS_TAG_POSTFIX}}
286298 dev_branches_tags_debian_rootless :
287299 when :
288300 branch :
289301 ignore : [ master ]
290302 arguments :
291303 tags :
292- - ${{CF_SHORT_REVISION }}${{DEBIAN_TAG_POSTFIX}}${{ROOTLESS_TAG_POSTFIX}}
304+ - ${{CF_BRANCH_TAG_NORMALIZED }}${{DEBIAN_TAG_POSTFIX}}${{ROOTLESS_TAG_POSTFIX}}
293305 when :
294306 steps :
295307 - name : push_step_alpine
@@ -350,7 +362,7 @@ steps:
350362 arguments :
351363 PIPELINE_ID : ' cli-v1-e2e/root'
352364 VARIABLE :
353- - CLI_VERSION=${{CF_SHORT_REVISION}}
365+ - CLI_VERSION=${{CF_BRANCH_TAG_NORMALIZED}}-${{ CF_SHORT_REVISION}}
354366 when :
355367 steps :
356368 - name : push_step_alpine
0 commit comments