[build] Add containerd components

Build and add containerd components (containerd.exe and containerd-shim-runhcs-v1.exe) to the payload.
openshift · Sep 21, 2021 · 23adc6b · 23adc6b
1 parent f8b4e23
commit 23adc6b
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 0 deletions.
diff --git a/build/Dockerfile b/build/Dockerfile
@@ -9,6 +9,16 @@ WORKDIR /build/windows-machine-config-operator/windows-machine-config-bootstrapp
 COPY windows-machine-config-bootstrapper/ .
 RUN make build
 
+# Build containerd
+WORKDIR /build/windows-machine-config-operator/containerd/
+COPY containerd/ .
+RUN GOOS=windows make
+
+# Build containerd shim
+WORKDIR /build/windows-machine-config-operator/hcsshim/
+COPY hcsshim/ .
+RUN GOOS=windows go build ./cmd/containerd-shim-runhcs-v1
+
 # Build hybrid-overlay
 WORKDIR /build/windows-machine-config-operator/ovn-kubernetes/
 COPY ovn-kubernetes/ .
@@ -69,6 +79,9 @@ RUN make build
 #│   ├── win-bridge.exe
 #│   ├── win-overlay.exe
 #│   └── cni-conf-template.json
+#├── containerd
+#│   ├── containerd.exe
+#│   └── containerd-shim-runhcs-v1
 #├── hybrid-overlay-node.exe
 #├── kube-node
 #│   ├── kubelet.exe
@@ -86,6 +99,11 @@ LABEL stage=operator
 WORKDIR /payload/
 COPY --from=build /build/windows-machine-config-operator/windows-machine-config-bootstrapper/wmcb.exe .
 
+# Copy containerd.exe and containerd-shim-runhcs-v1.exe
+WORKDIR /payload/containerd/
+COPY --from=build /build/windows-machine-config-operator/containerd/bin/containerd.exe .
+COPY --from=build /build/windows-machine-config-operator/hcsshim/containerd-shim-runhcs-v1.exe .
+
 # Copy hybrid-overlay-node.exe
 COPY --from=build /build/windows-machine-config-operator/ovn-kubernetes/go-controller/_output/go/bin/windows/hybrid-overlay-node.exe .
 

diff --git a/build/Dockerfile.base b/build/Dockerfile.base
@@ -9,6 +9,16 @@ WORKDIR /build/windows-machine-config-operator/windows-machine-config-bootstrapp
 COPY windows-machine-config-bootstrapper/ .
 RUN make build
 
+# Build containerd
+WORKDIR /build/windows-machine-config-operator/containerd/
+COPY containerd/ .
+RUN GOOS=windows make
+
+# Build containerd shim
+WORKDIR /build/windows-machine-config-operator/hcsshim/
+COPY hcsshim/ .
+RUN GOOS=windows go build ./cmd/containerd-shim-runhcs-v1
+
 # Build hybrid-overlay
 WORKDIR /build/windows-machine-config-operator/ovn-kubernetes/
 COPY ovn-kubernetes/ .
@@ -51,6 +61,11 @@ LABEL stage=base
 WORKDIR /payload/
 COPY --from=build /build/windows-machine-config-operator/windows-machine-config-bootstrapper/wmcb.exe .
 
+# Copy containerd.exe and containerd-shim-runhcs-v1.exe
+WORKDIR /payload/containerd/
+COPY --from=build /build/windows-machine-config-operator/containerd/bin/containerd.exe .
+COPY --from=build /build/windows-machine-config-operator/hcsshim/containerd-shim-runhcs-v1.exe .
+
 # Copy hybrid-overlay-node.exe
 COPY --from=build /build/windows-machine-config-operator/ovn-kubernetes/go-controller/_output/go/bin/windows/hybrid-overlay-node.exe .
 

diff --git a/build/Dockerfile.ci b/build/Dockerfile.ci
@@ -24,6 +24,16 @@ WORKDIR /build/windows-machine-config-operator/windows-machine-config-bootstrapp
 COPY windows-machine-config-bootstrapper/ .
 RUN make build
 
+# Build containerd
+WORKDIR /build/windows-machine-config-operator/containerd/
+COPY containerd/ .
+RUN GOOS=windows make
+
+# Build containerd shim
+WORKDIR /build/windows-machine-config-operator/hcsshim/
+COPY hcsshim/ .
+RUN GOOS=windows go build ./cmd/containerd-shim-runhcs-v1
+
 # Build hybrid-overlay
 WORKDIR /build/windows-machine-config-operator/ovn-kubernetes/
 COPY ovn-kubernetes/ .
@@ -86,6 +96,9 @@ RUN make build
 #│   ├── win-bridge.exe
 #│   ├── win-overlay.exe
 #│   └── cni-conf-template.json
+#├── containerd
+#│   ├── containerd.exe
+#│   └── containerd-shim-runhcs-v1
 #├── hybrid-overlay-node.exe
 #├── kube-node
 #│   ├── kubelet.exe
@@ -103,6 +116,11 @@ LABEL stage=operator
 WORKDIR /payload/
 COPY --from=build /build/windows-machine-config-operator/windows-machine-config-bootstrapper/wmcb.exe .
 
+# Copy containerd.exe and containerd-shim-runhcs-v1.exe
+WORKDIR /payload/containerd/
+COPY --from=build /build/windows-machine-config-operator/containerd/bin/containerd.exe .
+COPY --from=build /build/windows-machine-config-operator/hcsshim/containerd-shim-runhcs-v1.exe .
+
 # Copy hybrid-overlay-node.exe
 COPY --from=build /build/windows-machine-config-operator/ovn-kubernetes/go-controller/_output/go/bin/windows/hybrid-overlay-node.exe .