From 453c8bac57b3748ac56378d222dd5a67ea8df097 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Tue, 27 Nov 2018 11:30:03 +0100 Subject: Updated CRIO_COMMIT to pull in new conmon for CRIU Signed-off-by: Adrian Reber --- Dockerfile.Fedora | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Dockerfile.Fedora') diff --git a/Dockerfile.Fedora b/Dockerfile.Fedora index 38cd599d4..51bcaeaf0 100644 --- a/Dockerfile.Fedora +++ b/Dockerfile.Fedora @@ -72,7 +72,7 @@ RUN set -x \ && install -D -m 755 "$GOPATH"/bin/easyjson /usr/bin/ # Install conmon -ENV CRIO_COMMIT 662dbb31b5d4f5ed54511a47cde7190c61c28677 +ENV CRIO_COMMIT 7a283c391abb7bd25086a8ff91dbb36ebdd24466 RUN set -x \ && export GOPATH="$(mktemp -d)" \ && git clone https://github.com/kubernetes-sigs/cri-o.git "$GOPATH/src/github.com/kubernetes-sigs/cri-o.git" \ -- cgit v1.2.3-54-g00ecf From 87bf117417b9a27ed38a1a50d11e1e6dc2042c3f Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Thu, 25 Oct 2018 14:17:28 +0200 Subject: Revert "downgrade runc due a rootless bug" This reverts commit 803efd4d380f091c85cd45e0b3c35cf6333d47b7. Signed-off-by: Giuseppe Scrivano --- .papr.yml | 1 - Dockerfile.Fedora | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'Dockerfile.Fedora') diff --git a/.papr.yml b/.papr.yml index 26b527a36..b82da28e5 100644 --- a/.papr.yml +++ b/.papr.yml @@ -122,7 +122,6 @@ packages: - python3-varlink - python3-dateutil - python3-psutil - - https://kojipkgs.fedoraproject.org//packages/runc/1.0.0/55.dev.git578fe65.fc28/x86_64/runc-1.0.0-55.dev.git578fe65.fc28.x86_64.rpm tests: - sed 's/^expand-check.*/expand-check=0/g' -i /etc/selinux/semanage.conf diff --git a/Dockerfile.Fedora b/Dockerfile.Fedora index 51bcaeaf0..2080b597b 100644 --- a/Dockerfile.Fedora +++ b/Dockerfile.Fedora @@ -17,7 +17,7 @@ RUN dnf -y install btrfs-progs-devel \ libseccomp-devel \ libselinux-devel \ skopeo-containers \ - https://kojipkgs.fedoraproject.org//packages/runc/1.0.0/55.dev.git578fe65.fc28/x86_64/runc-1.0.0-55.dev.git578fe65.fc28.x86_64.rpm \ + runc \ make \ ostree-devel \ python \ -- cgit v1.2.3-54-g00ecf