File tree Expand file tree Collapse file tree 3 files changed +0
-20
lines changed
images/releng/k8s-ci-builder Expand file tree Collapse file tree 3 files changed +0
-20
lines changed Original file line number Diff line number Diff line change @@ -26,14 +26,10 @@ TAG ?= $(shell git describe --tags --always --dirty)
2626# Build args
2727GO_VERSION ?= 1.16.7
2828OS_CODENAME ?= buster
29- BAZEL_VERSION ?= 3.4.1
30- OLD_BAZEL_VERSION ?= 2.2.0
3129IMAGE_ARG ?= $(IMAGE ) :$(TAG ) -$(CONFIG )
3230
3331BUILD_ARGS = --build-arg=GO_VERSION=$(GO_VERSION ) \
3432 --build-arg=OS_CODENAME=$(OS_CODENAME ) \
35- --build-arg=BAZEL_VERSION=$(BAZEL_VERSION ) \
36- --build-arg=OLD_BAZEL_VERSION=$(OLD_BAZEL_VERSION ) \
3733 --build-arg=IMAGE_ARG=$(IMAGE_ARG )
3834
3935# Ensure support for 'docker buildx' and 'docker manifest' commands
Original file line number Diff line number Diff line change 2424 - CONFIG=${_CONFIG}
2525 - GO_VERSION=${_GO_VERSION}
2626 - OS_CODENAME=${_OS_CODENAME}
27- - BAZEL_VERSION=${_BAZEL_VERSION}
28- - OLD_BAZEL_VERSION=${_OLD_BAZEL_VERSION}
2927 args :
3028 - ' -c'
3129 - |
@@ -40,8 +38,6 @@ substitutions:
4038 _CONFIG : ' config'
4139 _GO_VERSION : ' 0.0.0'
4240 _OS_CODENAME : ' codename'
43- _BAZEL_VERSION : ' 0.0.0'
44- _OLD_BAZEL_VERSION : ' 0.0.0'
4541 _REGISTRY : ' fake.repository/registry-name'
4642
4743tags :
Original file line number Diff line number Diff line change @@ -3,35 +3,23 @@ variants:
33 CONFIG : default
44 GO_VERSION : ' 1.16.7'
55 OS_CODENAME : ' buster'
6- BAZEL_VERSION : ' 3.4.1'
7- OLD_BAZEL_VERSION : ' 2.2.0'
86 ' 1.23 ' :
97 CONFIG : ' 1.23'
108 GO_VERSION : ' 1.17'
119 OS_CODENAME : ' buster'
12- BAZEL_VERSION : ' 3.4.1'
13- OLD_BAZEL_VERSION : ' 2.2.0'
1410 ' 1.22 ' :
1511 CONFIG : ' 1.22'
1612 GO_VERSION : ' 1.16.7'
1713 OS_CODENAME : ' buster'
18- BAZEL_VERSION : ' 3.4.1'
19- OLD_BAZEL_VERSION : ' 2.2.0'
2014 ' 1.21 ' :
2115 CONFIG : ' 1.21'
2216 GO_VERSION : ' 1.16.7'
2317 OS_CODENAME : ' buster'
24- BAZEL_VERSION : ' 3.4.1'
25- OLD_BAZEL_VERSION : ' 2.2.0'
2618 ' 1.20 ' :
2719 CONFIG : ' 1.20'
2820 GO_VERSION : ' 1.15.15'
2921 OS_CODENAME : ' buster'
30- BAZEL_VERSION : ' 3.4.1'
31- OLD_BAZEL_VERSION : ' 2.2.0'
3222 ' 1.19 ' :
3323 CONFIG : ' 1.19'
3424 GO_VERSION : ' 1.15.15'
3525 OS_CODENAME : ' buster'
36- BAZEL_VERSION : ' 2.2.0'
37- OLD_BAZEL_VERSION : ' 0.23.2'
You can’t perform that action at this time.
0 commit comments