diff options
| -rwxr-xr-x | kokoro/ubuntu1604/25_docker.sh | 35 | ||||
| -rwxr-xr-x | kokoro/ubuntu1604/40_kokoro.sh | 8 | ||||
| l--------- | kokoro/ubuntu1804/25_docker.sh | 1 |
3 files changed, 43 insertions, 1 deletions
diff --git a/kokoro/ubuntu1604/25_docker.sh b/kokoro/ubuntu1604/25_docker.sh new file mode 100755 index 000000000..1d3defcd3 --- /dev/null +++ b/kokoro/ubuntu1604/25_docker.sh @@ -0,0 +1,35 @@ +#!/bin/bash + +# Copyright 2019 The gVisor 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. + +# Add dependencies. +apt-get update && apt-get -y install \ + apt-transport-https \ + ca-certificates \ + curl \ + gnupg-agent \ + software-properties-common + +# Install the key. +curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - + +# Add the repository. +add-apt-repository \ + "deb [arch=amd64] https://download.docker.com/linux/ubuntu \ + $(lsb_release -cs) \ + stable" + +# Install docker. +apt-get update && apt-get install -y docker-ce docker-ce-cli containerd.io diff --git a/kokoro/ubuntu1604/40_kokoro.sh b/kokoro/ubuntu1604/40_kokoro.sh index 1be865182..64772d74d 100755 --- a/kokoro/ubuntu1604/40_kokoro.sh +++ b/kokoro/ubuntu1604/40_kokoro.sh @@ -23,7 +23,7 @@ declare -r ssh_public_keys=( ) # Install dependencies. -apt-get update && apt-get install -y rsync coreutils python-psutil +apt-get update && apt-get install -y rsync coreutils python-psutil qemu-kvm # We need a kbuilder user. if useradd -c "kbuilder user" -m -s /bin/bash kbuilder; then @@ -39,6 +39,12 @@ cat > /etc/sudoers.d/kokoro <<EOF kbuilder ALL=(ALL) NOPASSWD:ALL EOF +# Ensure we can run Docker without sudo. +usermod -aG docker kbuilder + +# Ensure that we can access kvm. +usermod -aG kvm kbuilder + # Ensure that /tmpfs exists and is writable by kokoro. # # Note that kokoro will typically attach a second disk (sdb) to the instance diff --git a/kokoro/ubuntu1804/25_docker.sh b/kokoro/ubuntu1804/25_docker.sh new file mode 120000 index 000000000..63269bd83 --- /dev/null +++ b/kokoro/ubuntu1804/25_docker.sh @@ -0,0 +1 @@ +../ubuntu1604/25_docker.sh
\ No newline at end of file |