Merge pull request #6196 from cpuguy83/add_arm64_release

.dockerignore

@@ -0,0 +1,4 @@
+.github/
+.dockerignore
+releases/
+bin/

.github/workflows/release.yml

@@ -53,17 +53,18 @@ jobs:
     runs-on: ${{ matrix.os }}
     needs: [check]
     timeout-minutes: 10
-
     strategy:
       matrix:
-        os: [ubuntu-18.04, windows-2019]
+        os: [ubuntu-18.04]
-
+        platform:
+          - linux/amd64
+          - linux/arm64
+          - windows/amd64
     steps:
       - name: Install Go
         uses: actions/setup-go@v2
         with:
           go-version: '1.17.3'
-
       - name: Set env
         shell: bash
         env:
@@ -71,15 +72,8 @@ jobs:
         run: |
           releasever=${{ github.ref }}
           releasever="${releasever#refs/tags/}"
-          os=linux
-          [[ "${MOS}" =~ "windows" ]] && {
-            os=windows
-          }
           echo "RELEASE_VER=${releasever}" >> $GITHUB_ENV
           echo "GOPATH=${{ github.workspace }}" >> $GITHUB_ENV
-          echo "OS=${os}" >> $GITHUB_ENV
-          echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
-
       - name: Checkout containerd
         uses: actions/checkout@v2
         with:
@@ -90,169 +84,54 @@ jobs:
           ref: ${{ github.ref }}
           path: src/github.com/containerd/containerd
 
-      - name: HCS Shim commit
+      - name: Setup buildx instance
-        id: hcsshim_commit
+        uses: docker/setup-buildx-action@v1
-        if: startsWith(matrix.os, 'windows')
-        shell: bash
-        run: echo "::set-output name=sha::$(grep 'Microsoft/hcsshim ' go.mod | awk '{print $2}')"
-        working-directory: src/github.com/containerd/containerd
-
-      - name: Checkout hcsshim source
-        if: startsWith(matrix.os, 'windows')
-        uses: actions/checkout@v2
         with:
-          repository: Microsoft/hcsshim
+          use: true
-          ref: ${{ steps.hcsshim_commit.outputs.sha }}
+      - uses: crazy-max/ghaction-github-runtime@v1 # sets up needed vars for caching to github
-          path: src/github.com/Microsoft/hcsshim
-
       - name: Make
         shell: bash
         run: |
-          make build
+          cache="--cache-from=type=gha,scope=containerd-release --cache-to=type=gha,scope=containerd-release"
-          make binaries
+          if [[ "${PLATFORM}" =~ "windows" ]]; then
-          rm bin/containerd-stress*
+            # For Windows the cni build script generates a config but shells out to powershell (and also assume it is running on windows) to get a gateway and subnet.
-          [[ "${OS}" == "windows" ]] && {
+            # The values provided here are taken from packages that we previously generated.
-              (
+            export GATEWAY=172.21.16.1
-                bindir="$(pwd)/bin"
+            export PREFIX_LEN=12
-                cd ../../Microsoft/hcsshim
+            BUILD_ARGS="--build-arg GATEWAY --build-arg PREFIX_LEN"
-                GO111MODULE=on go build -mod=vendor -o "${bindir}/containerd-shim-runhcs-v1.exe" ./cmd/containerd-shim-runhcs-v1
-              )
-          }
-          TARFILE="containerd-${RELEASE_VER#v}-${OS}-amd64.tar.gz"
-          tar czf ${TARFILE} bin/
-          sha256sum ${TARFILE} >${TARFILE}.sha256sum
-        working-directory: src/github.com/containerd/containerd
-
-      - name: Save build binaries
-        uses: actions/upload-artifact@v2
-        with:
-          name: containerd-binaries-${{ matrix.os }}
-          path: src/github.com/containerd/containerd/*.tar.gz*
-
-      - name: Make cri-containerd tar
-        shell: bash
-        env:
-          RUNC_FLAVOR: runc
-        run: |
-          if [[ "${OS}" == "linux" ]]; then
-            sudo apt-get update
-            sudo apt-get install -y gperf
-            sudo -E PATH=$PATH script/setup/install-seccomp
           fi
-          make cri-release cri-cni-release
+          docker buildx build ${cache} --build-arg RELEASE_VER --build-arg GO_VERSION ${BUILD_ARGS} -f .github/workflows/release/Dockerfile --platform=${PLATFORM} -o releases/ .
-        working-directory: src/github.com/containerd/containerd
+          echo PLATFORM_CLEAN=${PLATFORM/\//-} >> $GITHUB_ENV
 
-      - name: Save cri-containerd binaries
+          # Remove symlinks since we don't want these in the release Artifacts
+          find ./releases/ -maxdepth 1 -type l | xargs rm
+        working-directory: src/github.com/containerd/containerd
+        env:
+          GO_VERSION: '1.17.2'
+          PLATFORM: ${{ matrix.platform }}
+      - name: Save Artifacts
         uses: actions/upload-artifact@v2
         with:
-          name: cri-containerd-binaries-${{ matrix.os }}
+          name: release-tars-${{env.PLATFORM_CLEAN}}
-          path: src/github.com/containerd/containerd/releases/cri-containerd-*.tar.gz*
+          path: src/github.com/containerd/containerd/releases/*.tar.gz*
 
   release:
     name: Create containerd Release
     runs-on: ubuntu-18.04
     timeout-minutes: 10
     needs: [build, check]
-    outputs:
-      upload_url: ${{ steps.create_release.outputs.upload_url }}
-
     steps:
       - name: Download builds and release notes
         uses: actions/download-artifact@v2
         with:
           path: builds
       - name: Create Release
-        id: create_release
+        uses: softprops/action-gh-release@v1
-        uses: actions/create-release@v1.1.2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          tag_name: ${{ github.ref }}
+          token: ${{ secrets.GITHUB_TOKEN }}
-          release_name: containerd ${{ needs.check.outputs.stringver }}
+          fail_on_unmatched_files: true
-          body_path: ./builds/containerd-release-notes/release-notes.md
           draft: false
           prerelease: ${{ contains(github.ref, 'beta') || contains(github.ref, 'rc') }}
-
+          body_path: ./builds/containerd-release-notes/release-notes.md
-  release-upload:
+          files: |
-    name: Upload containerd tarballs
+            builds/release-tars-**/*
-    runs-on: ubuntu-18.04
-    timeout-minutes: 10
-    needs: [release]
-
-    strategy:
-      matrix:
-        os: [ubuntu-18.04, windows-2019]
-
-    steps:
-      - name: Download builds and release notes
-        uses: actions/download-artifact@v2
-        with:
-          path: builds
-      - name: Catalog build assets for upload
-        id: catalog
-        env:
-          OS: ${{ matrix.os }}
-        run: |
-          _filenum=1
-          for f in `ls "builds/containerd-binaries-${OS}"`; do
-            echo "::set-output name=file${_filenum}::${f}"
-            let "_filenum+=1"
-          done
-          for f in `ls builds/cri-containerd-binaries-${OS}`; do
-            echo "::set-output name=file${_filenum}::${f}"
-            let "_filenum+=1"
-          done
-      - name: Upload containerd tarball
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.release.outputs.upload_url }}
-          asset_path: ./builds/containerd-binaries-${{ matrix.os }}/${{ steps.catalog.outputs.file1 }}
-          asset_name: ${{ steps.catalog.outputs.file1 }}
-          asset_content_type: application/gzip
-      - name: Upload sha256 sum
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.release.outputs.upload_url }}
-          asset_path: ./builds/containerd-binaries-${{ matrix.os }}/${{ steps.catalog.outputs.file2 }}
-          asset_name: ${{ steps.catalog.outputs.file2 }}
-          asset_content_type: text/plain
-      - name: Upload cri containerd tarball
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.release.outputs.upload_url }}
-          asset_path: ./builds/cri-containerd-binaries-${{ matrix.os }}/${{ steps.catalog.outputs.file3 }}
-          asset_name: ${{ steps.catalog.outputs.file3 }}
-          asset_content_type: application/gzip
-      - name: Upload cri sha256 sum
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.release.outputs.upload_url }}
-          asset_path: ./builds/cri-containerd-binaries-${{ matrix.os }}/${{ steps.catalog.outputs.file4 }}
-          asset_name: ${{ steps.catalog.outputs.file4 }}
-          asset_content_type: text/plain
-      - name: Upload cri/cni containerd tarball
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.release.outputs.upload_url }}
-          asset_path: ./builds/cri-containerd-binaries-${{ matrix.os }}/${{ steps.catalog.outputs.file5 }}
-          asset_name: ${{ steps.catalog.outputs.file5 }}
-          asset_content_type: application/gzip
-      - name: Upload cri/cni sha256 sum
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.release.outputs.upload_url }}
-          asset_path: ./builds/cri-containerd-binaries-${{ matrix.os }}/${{ steps.catalog.outputs.file6 }}
-          asset_name: ${{ steps.catalog.outputs.file6 }}
-          asset_content_type: text/plain

.github/workflows/release/Dockerfile

@@ -0,0 +1,54 @@
+#   Copyright The containerd Authors.
+
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+
+#       http://www.apache.org/licenses/LICENSE-2.0
+
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+ARG UBUNTU_VERSION=18.04
+ARG BASE_IMAGE=ubuntu:${UBUNTU_VERSION}
+ARG GO_VERSION
+ARG GO_IMAGE=golang:${GO_VERSION}
+FROM --platform=$BUILDPLATFORM $GO_IMAGE AS go
+FROM --platform=$BUILDPLATFORM tonistiigi/xx@sha256:425941eb25cc113009b1c651bd275e04593cea12c48311fe8ace6ceeecdcc645 AS xx
+
+FROM --platform=$BUILDPLATFORM ${BASE_IMAGE} AS base
+COPY --from=xx / /
+SHELL ["/bin/bash", "-xec"]
+RUN	apt-get update && \
+	apt-get install -y git pkg-config
+ARG TARGETPLATFORM
+RUN xx-apt-get install -y libseccomp-dev btrfs-progs gcc
+ENV PATH=/usr/local/go/bin:$PATH
+ENV GOPATH=/go
+ENV CGO_ENABLED=1
+
+FROM base AS linux
+FROM base AS windows
+# Set variables used by cni script which would otherwise shell out to powershell
+ARG GATEWAY
+ARG PREFIX_LEN
+
+FROM ${TARGETOS} AS target
+WORKDIR /go/src/github.com/containerd/containerd
+COPY . .
+ARG TARGETPLATFORM
+ARG RELEASE_VER
+ENV VERSION=$RELEASE_VER
+RUN \
+	--mount=type=bind,from=go,source=/usr/local/go,target=/usr/local/go \
+	--mount=type=cache,target=/root/.cache/go-build \
+	--mount=type=cache,target=/go/pkg \
+	export CC=$(xx-info)-gcc && xx-go --wrap && \
+	make release cri-release cri-cni-release && \
+	for f in $(find bin -executable -type f); do xx-verify $f; done
+
+FROM scratch AS release
+COPY --from=target /go/src/github.com/containerd/containerd/releases/ /

Makefile

@@ -30,7 +30,7 @@ MANDIR        ?= $(DATADIR)/man
 TEST_IMAGE_LIST ?=
 
 # Used to populate variables in version package.
-VERSION=$(shell git describe --match 'v[0-9]*' --dirty='.m' --always)
+VERSION ?= $(shell git describe --match 'v[0-9]*' --dirty='.m' --always)
 REVISION=$(shell git rev-parse HEAD)$(shell if ! git diff --no-ext-diff --quiet --exit-code; then echo .m; fi)
 PACKAGE=github.com/containerd/containerd
 SHIM_CGO_ENABLED ?= 0
@@ -271,6 +271,7 @@ install-man: man
 	@echo "$(WHALE) $@"
 	$(foreach manpage,$(addprefix man/,$(MANPAGES)), $(call installmanpage,$(manpage),$(subst .,,$(suffix $(manpage))),$(notdir $(manpage))))
 
+
 releases/$(RELEASE).tar.gz: $(BINARIES)
 	@echo "$(WHALE) $@"
 	@rm -rf releases/$(RELEASE) releases/$(RELEASE).tar.gz

Makefile.windows

@@ -22,7 +22,11 @@ ifeq ($(GOARCH),amd64)
 	TESTFLAGS_RACE= -race
 endif
 
-BINARIES:=$(addsuffix .exe,$(BINARIES))
+WINDOWS_SHIM=bin/containerd-shim-runhcs-v1.exe
+BINARIES := $(addsuffix .exe,$(BINARIES)) $(WINDOWS_SHIM)
+
+$(WINDOWS_SHIM): script/setup/install-runhcs-shim go.mod
+	DESTDIR=$(PWD)/bin $<
 
 bin/%.exe: cmd/% FORCE
 	$(BUILD_BINARY)

script/setup/install-cni-windows

@@ -65,10 +65,10 @@ calculate_subnet() {
 
 # nat already exists on the Windows VM, the subnet and gateway
 # we specify should match that.
-gateway="$(powershell -c "(Get-NetIPAddress -InterfaceAlias 'vEthernet (nat)' -AddressFamily IPv4).IPAddress")"
+: ${GATEWAY:="$(powershell -c "(Get-NetIPAddress -InterfaceAlias 'vEthernet (nat)' -AddressFamily IPv4).IPAddress")"}
-prefix_len="$(powershell -c "(Get-NetIPAddress -InterfaceAlias 'vEthernet (nat)' -AddressFamily IPv4).PrefixLength")"
+: ${PREFIX_LEN:="$(powershell -c "(Get-NetIPAddress -InterfaceAlias 'vEthernet (nat)' -AddressFamily IPv4).PrefixLength")"}
 
-subnet="$(calculate_subnet "$gateway" "$prefix_len")"
+subnet="$(calculate_subnet "$GATEWAY" "$PREFIX_LEN")"
 
 # The "name" field in the config is used as the underlying
 # network type right now (see
@@ -85,7 +85,7 @@ bash -c 'cat >"'"${CNI_CONFIG_DIR}"'"/0-containerd-nat.conf <<EOF
         "subnet": "'$subnet'",
         "routes": [
             {
-                "GW": "'$gateway'"
+                "GW": "'$GATEWAY'"
             }
         ]
     },

script/setup/install-runhcs-shim

@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+
+#   Copyright The containerd Authors.
+
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+
+#       http://www.apache.org/licenses/LICENSE-2.0
+
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+: ${RUNHCS_VERSION:="$(grep 'Microsoft/hcsshim ' go.mod | awk '{print $2}')"}
+: ${RUNHCS_REPO:="https://github.com/Microsoft/hcsshim.git"}
+: ${DESTDIR:=''}
+: ${GOOS:="windows"}
+
+tmpdir="$(mktemp -d)"
+
+cleanup() {
+    rm -rf "$tmpdir"
+}
+
+trap 'cleanup' EXIT
+
+export GOOS
+
+(
+    set -e -x
+    cd "$tmpdir"
+    git init .
+    git remote add origin "$RUNHCS_REPO"
+    git fetch --tags --depth=1 origin ${RUNHCS_VERSION}
+    git checkout "refs/tags/${RUNHCS_VERSION}" || git checkout "refs/heads/${RUNHCS_VERSION}" || git checkout "${RUNHCS_VERSION}"
+    GO111MODULE=on go build -mod=vendor -o "${DESTDIR}/containerd-shim-runhcs-v1.exe" ./cmd/containerd-shim-runhcs-v1
+)