Build containerd from guardian

.gitmodules

@@ -42,10 +42,6 @@
 	path = src/grootfs
 	url = https://github.com/cloudfoundry/grootfs
 	branch = master
-[submodule "src/gopath/src/github.com/containerd/containerd"]
-	path = src/gopath/src/github.com/containerd/containerd
-	url = https://github.com/containerd/containerd
-	branch = master
 [submodule "src/gopath/src/code.cloudfoundry.org/archiver"]
 	path = src/gopath/src/code.cloudfoundry.org/archiver
 	url = https://github.com/cloudfoundry/archiver

ci/helpers/build-binaries.bash

@@ -77,9 +77,13 @@ function build_containerd() {
   local target="$2"
 
   (
-    cd "${release}/src/gopath/src/github.com/containerd/containerd" || exit
+    cd "${release}/src/guardian/vendor/github.com/containerd/containerd" || exit
 
-    BUILDTAGS=no_btrfs make
+    BUILDTAGS=no_btrfs make ./bin/containerd
+    BUILDTAGS=no_btrfs make ./bin/containerd-shim
+    BUILDTAGS=no_btrfs make ./bin/containerd-shim-runc-v1
+    BUILDTAGS=no_btrfs make ./bin/containerd-shim-runc-v2
+    BUILDTAGS=no_btrfs make ./bin/ctr
     mv bin/* "${target}"
   )
 }

packages/containerd/packaging

@@ -2,15 +2,19 @@
 set -euo pipefail
 
 mkdir -p "${BOSH_INSTALL_TARGET}/src"
-mv gopath/src/* "${BOSH_INSTALL_TARGET}/src"
-mv "${BOSH_INSTALL_TARGET}/src" .
+mv * ${BOSH_INSTALL_TARGET}/src
+mv ${BOSH_INSTALL_TARGET}/src .
 
 source /var/vcap/packages/golang-*-linux/bosh/compile.env
 
 mkdir -p "${BOSH_INSTALL_TARGET}/bin"
 export GOBIN="${BOSH_INSTALL_TARGET}/bin"
 
-pushd src/github.com/containerd/containerd
-  BUILDTAGS=no_btrfs make
+pushd src/guardian/vendor/github.com/containerd/containerd
+  BUILDTAGS=no_btrfs make ./bin/containerd
+  BUILDTAGS=no_btrfs make ./bin/containerd-shim
+  BUILDTAGS=no_btrfs make ./bin/containerd-shim-runc-v1
+  BUILDTAGS=no_btrfs make ./bin/containerd-shim-runc-v2
+  BUILDTAGS=no_btrfs make ./bin/ctr
   cp -R bin "${BOSH_INSTALL_TARGET}"
 popd

packages/gats/spec

@@ -40,17 +40,22 @@ files:
   - garden-integration-tests/vendor/github.com/go-task/slim-sprig/*.go # gosub
   - garden-integration-tests/vendor/github.com/godbus/dbus/v5/*.go # gosub
   - garden-integration-tests/vendor/github.com/gogo/protobuf/gogoproto/*.go # gosub
+  - garden-integration-tests/vendor/github.com/gogo/protobuf/gogoproto/Makefile # gosub
   - garden-integration-tests/vendor/github.com/gogo/protobuf/proto/*.go # gosub
+  - garden-integration-tests/vendor/github.com/gogo/protobuf/proto/Makefile # gosub
   - garden-integration-tests/vendor/github.com/gogo/protobuf/protoc-gen-gogo/descriptor/*.go # gosub
+  - garden-integration-tests/vendor/github.com/gogo/protobuf/protoc-gen-gogo/descriptor/Makefile # gosub
   - garden-integration-tests/vendor/github.com/google/go-cmp/cmp/*.go # gosub
   - garden-integration-tests/vendor/github.com/google/go-cmp/cmp/internal/diff/*.go # gosub
   - garden-integration-tests/vendor/github.com/google/go-cmp/cmp/internal/flags/*.go # gosub
   - garden-integration-tests/vendor/github.com/google/go-cmp/cmp/internal/function/*.go # gosub
   - garden-integration-tests/vendor/github.com/google/go-cmp/cmp/internal/value/*.go # gosub
   - garden-integration-tests/vendor/github.com/hashicorp/errwrap/*.go # gosub
   - garden-integration-tests/vendor/github.com/hashicorp/go-multierror/*.go # gosub
+  - garden-integration-tests/vendor/github.com/hashicorp/go-multierror/Makefile # gosub
   - garden-integration-tests/vendor/github.com/josharian/intern/*.go # gosub
   - garden-integration-tests/vendor/github.com/mailru/easyjson/*.go # gosub
+  - garden-integration-tests/vendor/github.com/mailru/easyjson/Makefile # gosub
   - garden-integration-tests/vendor/github.com/mailru/easyjson/buffer/*.go # gosub
   - garden-integration-tests/vendor/github.com/mailru/easyjson/jlexer/*.go # gosub
   - garden-integration-tests/vendor/github.com/mailru/easyjson/jwriter/*.go # gosub
@@ -112,6 +117,7 @@ files:
   - garden-integration-tests/vendor/github.com/opencontainers/runc/libcontainer/utils/*.go # gosub
   - garden-integration-tests/vendor/github.com/opencontainers/runtime-spec/specs-go/*.go # gosub
   - garden-integration-tests/vendor/github.com/pkg/errors/*.go # gosub
+  - garden-integration-tests/vendor/github.com/pkg/errors/Makefile # gosub
   - garden-integration-tests/vendor/github.com/sirupsen/logrus/*.go # gosub
   - garden-integration-tests/vendor/github.com/tedsuo/rata/*.go # gosub
   - garden-integration-tests/vendor/github.com/wavefronthq/wavefront-sdk-go/event/*.go # gosub

scripts/sync-package-specs

@@ -37,15 +37,26 @@ function sync_package() {
         if ls ../../src/${package}/*.h >/dev/null 2>&1; then
           echo ${package} | sed -e 's/\(.*\)/  - \1\/*.h # gosub/g'
         fi
+        if ls ../../src/${package}/Makefile >/dev/null 2>&1; then
+          echo ${package} | sed -e 's/\(.*\)/  - \1\/Makefile # gosub/g'
+        fi
       done
     } > $spec.new
 
     mv $spec.new $spec
   )
 }
 
+sync_package containerd guardian \
+  -app github.com/containerd/containerd/cmd/ctr \
+  -app github.com/containerd/containerd/cmd/containerd \
+  -app github.com/containerd/containerd/cmd/containerd-shim \
+  -app github.com/containerd/containerd/cmd/containerd-shim-runc-v1 \
+  -app github.com/containerd/containerd/cmd/containerd-shim-runc-v2 &
+
 sync_package gats garden-integration-tests -app github.com/onsi/ginkgo/ginkgo \
   -test code.cloudfoundry.org/garden-integration-tests/... &
+
 sync_package gpats garden-performance-acceptance-tests -app  github.com/onsi/ginkgo/ginkgo \
   -test code.cloudfoundry.org/garden-performance-acceptance-tests/... &