Skip to content

Commit 095ca77

Browse files
jmartin84jmartin84
committed
Use build args to override binary commits in dockerfile
Signed-off-by: Justen Martin <jmart@the-coder.com>
1 parent 6f069f1 commit 095ca77

File tree

10 files changed

+22
-10
lines changed

10 files changed

+22
-10
lines changed

‎Dockerfile‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ FROM runtime-dev-cross-${CROSS} AS runtime-dev
138138

139139
FROM base AS tomlv
140140
ENV INSTALL_BINARY_NAME=tomlv
141+
ARG TOMLV_COMMIT
141142
COPY hack/dockerfile/install/install.sh ./install.sh
142143
COPY hack/dockerfile/install/$INSTALL_BINARY_NAME.installer ./
143144
RUN --mount=type=cache,target=/root/.cache/go-build \
@@ -146,6 +147,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
146147

147148
FROM base AS vndr
148149
ENV INSTALL_BINARY_NAME=vndr
150+
ARG VNDR_COMMIT
149151
COPY hack/dockerfile/install/install.sh ./install.sh
150152
COPY hack/dockerfile/install/$INSTALL_BINARY_NAME.installer ./
151153
RUN --mount=type=cache,target=/root/.cache/go-build \
@@ -154,6 +156,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
154156

155157
FROM dev-base AS containerd
156158
ARG DEBIAN_FRONTEND
159+
ARG CONTAINERD_COMMIT
157160
RUN --mount=type=cache,sharing=locked,id=moby-containerd-aptlib,target=/var/lib/apt \
158161
--mount=type=cache,sharing=locked,id=moby-containerd-aptcache,target=/var/cache/apt \
159162
apt-get update && apt-get install -y --no-install-recommends \
@@ -167,6 +170,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
167170

168171
FROM dev-base AS proxy
169172
ENV INSTALL_BINARY_NAME=proxy
173+
ARG LIBNETWORK_COMMIT
170174
COPY hack/dockerfile/install/install.sh ./install.sh
171175
COPY hack/dockerfile/install/$INSTALL_BINARY_NAME.installer ./
172176
RUN --mount=type=cache,target=/root/.cache/go-build \
@@ -175,6 +179,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
175179

176180
FROM base AS golangci_lint
177181
ENV INSTALL_BINARY_NAME=golangci_lint
182+
ARG GOLANGCI_LINT_COMMIT
178183
COPY hack/dockerfile/install/install.sh ./install.sh
179184
COPY hack/dockerfile/install/$INSTALL_BINARY_NAME.installer ./
180185
RUN --mount=type=cache,target=/root/.cache/go-build \
@@ -183,6 +188,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
183188

184189
FROM base AS gotestsum
185190
ENV INSTALL_BINARY_NAME=gotestsum
191+
ARG GOTESTSUM_COMMIT
186192
COPY hack/dockerfile/install/install.sh ./install.sh
187193
COPY hack/dockerfile/install/$INSTALL_BINARY_NAME.installer ./
188194
RUN --mount=type=cache,target=/root/.cache/go-build \
@@ -191,6 +197,8 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
191197

192198
FROM dev-base AS dockercli
193199
ENV INSTALL_BINARY_NAME=dockercli
200+
ARG DOCKERCLI_CHANNEL
201+
ARG DOCKERCLI_VERSION
194202
COPY hack/dockerfile/install/install.sh ./install.sh
195203
COPY hack/dockerfile/install/$INSTALL_BINARY_NAME.installer ./
196204
RUN --mount=type=cache,target=/root/.cache/go-build \
@@ -199,6 +207,8 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
199207

200208
FROM runtime-dev AS runc
201209
ENV INSTALL_BINARY_NAME=runc
210+
ARG RUNC_COMMIT
211+
ARG RUNC_BUILDTAGS
202212
COPY hack/dockerfile/install/install.sh ./install.sh
203213
COPY hack/dockerfile/install/$INSTALL_BINARY_NAME.installer ./
204214
RUN --mount=type=cache,target=/root/.cache/go-build \
@@ -207,6 +217,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
207217

208218
FROM dev-base AS tini
209219
ARG DEBIAN_FRONTEND
220+
ARG TINI_COMMIT
210221
RUN --mount=type=cache,sharing=locked,id=moby-tini-aptlib,target=/var/lib/apt \
211222
--mount=type=cache,sharing=locked,id=moby-tini-aptcache,target=/var/cache/apt \
212223
apt-get update && apt-get install -y --no-install-recommends \
@@ -221,6 +232,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
221232

222233
FROM dev-base AS rootlesskit
223234
ENV INSTALL_BINARY_NAME=rootlesskit
235+
ARG ROOTLESSKIT_COMMIT
224236
COPY hack/dockerfile/install/install.sh ./install.sh
225237
COPY hack/dockerfile/install/$INSTALL_BINARY_NAME.installer ./
226238
RUN --mount=type=cache,target=/root/.cache/go-build \

‎hack/dockerfile/install/containerd.installer‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# containerd is also pinned in vendor.conf. When updating the binary
55
# version you may also need to update the vendor version to pick up bug
66
# fixes or new APIs.
7-
CONTAINERD_COMMIT=36cf5b690dcc00ff0f34ff7799209050c3d0c59a # v1.3.0
7+
: ${CONTAINERD_COMMIT:=36cf5b690dcc00ff0f34ff7799209050c3d0c59a} # v1.3.0
88

99
install_containerd() {
1010
echo "Install containerd version $CONTAINERD_COMMIT"

‎hack/dockerfile/install/dockercli.installer‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

3-
DOCKERCLI_CHANNEL=${DOCKERCLI_CHANNEL:-stable}
4-
DOCKERCLI_VERSION=${DOCKERCLI_VERSION:-17.06.2-ce}
3+
: ${DOCKERCLI_CHANNEL:=stable}
4+
: ${DOCKERCLI_VERSION:=17.06.2-ce}
55

66
install_dockercli() {
77
echo "Install docker/cli version $DOCKERCLI_VERSION from $DOCKERCLI_CHANNEL"

‎hack/dockerfile/install/gotestsum.installer‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
GOTESTSUM_COMMIT='v0.3.5'
3+
: ${GOTESTSUM_COMMIT:=v0.3.5}
44

55
install_gotestsum() {
66
echo "Installing gotestsum version $GOTESTSUM_COMMIT"

‎hack/dockerfile/install/proxy.installer‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# LIBNETWORK_COMMIT is used to build the docker-userland-proxy binary. When
44
# updating the binary version, consider updating github.com/docker/libnetwork
55
# in vendor.conf accordingly
6-
LIBNETWORK_COMMIT=96bcc0dae898308ed659c5095526788a602f4726
6+
: ${LIBNETWORK_COMMIT:=96bcc0dae898308ed659c5095526788a602f4726}
77

88
install_proxy() {
99
case "$1" in

‎hack/dockerfile/install/rootlesskit.installer‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
# v0.7.0
4-
ROOTLESSKIT_COMMIT=791ac8cb209a107505cd1ca5ddf23a49913e176c
4+
: ${ROOTLESSKIT_COMMIT:=791ac8cb209a107505cd1ca5ddf23a49913e176c}
55

66
install_rootlesskit() {
77
case "$1" in

‎hack/dockerfile/install/runc.installer‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# The version of runc should match the version that is used by the containerd
55
# version that is used. If you need to update runc, open a pull request in
66
# the containerd project first, and update both after that is merged.
7-
RUNC_COMMIT=3e425f80a8c931f88e6d94a8c831b9d5aa481657 # v1.0.0-rc8-92-g84373aaa
7+
: ${RUNC_COMMIT:=3e425f80a8c931f88e6d94a8c831b9d5aa481657} # v1.0.0-rc8-92-g84373aaa
88

99
install_runc() {
1010
# If using RHEL7 kernels (3.10.0 el7), disable kmem accounting/limiting

‎hack/dockerfile/install/tini.installer‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
TINI_COMMIT=fec3683b971d9c3ef73f284f176672c44b448662 # v0.18.0
3+
: ${TINI_COMMIT:=fec3683b971d9c3ef73f284f176672c44b448662} # v0.18.0
44

55
install_tini() {
66
echo "Install tini version $TINI_COMMIT"

‎hack/dockerfile/install/tomlv.installer‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# When updating TOMLV_COMMIT, consider updating github.com/BurntSushi/toml
44
# in vendor.conf accordingly
5-
TOMLV_COMMIT=3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005 # v0.3.1
5+
: ${TOMLV_COMMIT:=3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005} # v0.3.1
66

77
install_tomlv() {
88
echo "Install tomlv version $TOMLV_COMMIT"

‎hack/dockerfile/install/vndr.installer‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
VNDR_COMMIT=f5ab8fc5fb64d66b5c6e55a0bcb58b2e92362fa0
3+
: ${VNDR_COMMIT:=f5ab8fc5fb64d66b5c6e55a0bcb58b2e92362fa0}
44

55
install_vndr() {
66
echo "Install vndr version $VNDR_COMMIT"

0 commit comments

Comments
 (0)