Merge pull request #3995 from twz123/containerd-custom-runc

[release-1.28] Build containerd using runc v1.1.12
k0sproject · Feb 1, 2024 · 710040e · 710040e
2 parents b189177 + eb90ee9
commit 710040e
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/embedded-bins/containerd/Dockerfile b/embedded-bins/containerd/Dockerfile
@@ -23,14 +23,17 @@ ARG TARGET_OS \
   CONTAINERD_BINS
 
 RUN go version
-RUN make \
-	CGO_ENABLED=${BUILD_GO_CGO_ENABLED} \
-	SHIM_CGO_ENABLED=${BUILD_SHIM_GO_CGO_ENABLED} \
-	GO_TAGS="-tags=${BUILD_GO_TAGS}" \
-	COMMANDS="${CONTAINERD_BINS}" \
-	GO_BUILD_FLAGS="${BUILD_GO_FLAGS}" \
-	EXTRA_LDFLAGS="${BUILD_GO_LDFLAGS_EXTRA}" \
-	GOOS="${TARGET_OS}"
+RUN set -ex \
+  && go get github.com/opencontainers/[email protected] \
+  && make \
+    CGO_ENABLED=${BUILD_GO_CGO_ENABLED} \
+    SHIM_CGO_ENABLED=${BUILD_SHIM_GO_CGO_ENABLED} \
+    GO_TAGS="-tags=${BUILD_GO_TAGS}" \
+    COMMANDS="${CONTAINERD_BINS}" \
+    GO_BUILD_FLAGS="${BUILD_GO_FLAGS}" \
+    EXTRA_LDFLAGS="${BUILD_GO_LDFLAGS_EXTRA}" \
+    GOOS="${TARGET_OS}" \
+    vendor all
 
 FROM scratch
 COPY --from=build /go/src/github.com/containerd/containerd/bin/* /bin/