summaryrefslogtreecommitdiffhomepage
path: root/tools/installers/head.sh
diff options
context:
space:
mode:
authorAdin Scannell <ascannell@google.com>2020-05-05 22:00:14 -0700
committerAdin Scannell <ascannell@google.com>2020-07-09 17:39:47 -0700
commit2afff44403e046078301de39f0252bb57fc018c7 (patch)
treef944f66ffaab8f10029b451755bcb20a3ff40269 /tools/installers/head.sh
parent2f24ab339736315659f26699ab50aa2982d7e890 (diff)
Update shim to build using bazel.
The go.mod dependency tree for the shim was somehow contradictory. After resolving these issues (e.g. explicitly imported k8s 1.14, pulling a specific dbus version), and adding all dependencies, the shim can now be build as part of the regular bazel tree. As part of this process, minor cleanup was done in all the source files: headers were standardized (and include "The gVisor Authors" in addition to the "The containerd Authors" if originally derived from containerd sources), and comments were cleaned up to meet coding standards. This change makes the containerd installation dynamic, so that multiple versions can be tested, and drops the static installer for the VM image itself. This change also updates test/root/crictl_test.go and related utilities, so that the containerd tests can be run on any version (and in cases where it applies, they can be run on both v1 and v2 as parameterized tests).
Diffstat (limited to 'tools/installers/head.sh')
-rwxr-xr-xtools/installers/head.sh8
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/installers/head.sh b/tools/installers/head.sh
index 7fc566ebd..e6753f8a5 100755
--- a/tools/installers/head.sh
+++ b/tools/installers/head.sh
@@ -17,5 +17,11 @@
# Install our runtime.
$(find . -executable -type f -name runsc) install
+# Install all the shims.
+find . -executable -type f -executable -name containerd-shim-runsc-v1 -exec cp {} /usr/bin \;
+find . -executable -type f -executable -name gvisor-containerd-shim -exec cp {} /usr/bin \;
+
# Restart docker.
-service docker restart || true
+if service docker status 2>/dev/null; then
+ service docker restart
+fi