diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-10-30 04:21:39 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-30 04:21:39 -0700 |
| commit | 24d4f114ea180ffae63c8a9a92049e4b873f6f5c (patch) | |
| tree | 88b227c2baf973dd78a830a99b6c300a49346b82 | |
| parent | d5b600171d32a20a61d604219c1c230bc0b49343 (diff) | |
| parent | 8126eb8a3951037871f1e11aafd7f185a7f1e6a9 (diff) | |
| download | podman-24d4f114ea180ffae63c8a9a92049e4b873f6f5c.tar.gz podman-24d4f114ea180ffae63c8a9a92049e4b873f6f5c.tar.bz2 podman-24d4f114ea180ffae63c8a9a92049e4b873f6f5c.zip | |
Merge pull request #1725 from cevich/newer_runc_commit
Use newer runc commit in VM images
| -rw-r--r-- | .cirrus.yml | 4 | ||||
| -rw-r--r-- | Dockerfile | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 87842da74..ae660394b 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -20,7 +20,7 @@ env: CNI_COMMIT: "7480240de9749f9a0a5c8614b17f1f03e0c06ab9" CRIO_COMMIT: "662dbb31b5d4f5ed54511a47cde7190c61c28677" CRIU_COMMIT: "584cbe4643c3fc7dc901ff08bf923ca0fe7326f9" - RUNC_COMMIT: "ad0f5255060d36872be04de22f8731f38ef2d7b1" + RUNC_COMMIT: "78ef28e63bec2ee4c139b5e3e0d691eb9bdc748d" # File to update in home-dir with task-specific env. var values ENVLIB: ".bash_profile" # Overrides default location (/tmp/cirrus) for repo clone @@ -42,7 +42,7 @@ full_vm_testing_task: # 'matrix' combinations. All run in parallel. matrix: # Images are generated separetly, from build_images_task (below) - image_name: "ubuntu-1804-bionic-v20180911-libpod-fce09afe" + image_name: "ubuntu-1804-bionic-v20180911-libpod-63a86a18" # TODO: Make these work (also build_images_task below) #image_name: "rhel-server-ec2-7-5-165-1-libpod-fce09afe" #image_name: "centos-7-v20180911-libpod-fce09afe" diff --git a/Dockerfile b/Dockerfile index 62be638f2..70d1a7629 100644 --- a/Dockerfile +++ b/Dockerfile @@ -52,7 +52,7 @@ ADD . /go/src/github.com/containers/libpod RUN set -x && cd /go/src/github.com/containers/libpod && make install.libseccomp.sudo # Install runc -ENV RUNC_COMMIT ad0f5255060d36872be04de22f8731f38ef2d7b1 +ENV RUNC_COMMIT 78ef28e63bec2ee4c139b5e3e0d691eb9bdc748d RUN set -x \ && export GOPATH="$(mktemp -d)" \ && git clone https://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ |