summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hunt <pehunt@redhat.com>2019-06-28 12:27:23 -0400
committerPeter Hunt <pehunt@redhat.com>2019-07-22 13:20:51 -0400
commit0671dca90de97be983f13a0a5e714f825013eae4 (patch)
tree1a05eb48f340c44bb003ad44ba11891121f84d87
parentab7b47ca60da11f9e24688cfe2ae3d00eb123471 (diff)
downloadpodman-0671dca90de97be983f13a0a5e714f825013eae4.tar.gz
podman-0671dca90de97be983f13a0a5e714f825013eae4.tar.bz2
podman-0671dca90de97be983f13a0a5e714f825013eae4.zip
bump conmon to 1.0.0-rc2
Signed-off-by: Peter Hunt <pehunt@redhat.com>
-rw-r--r--.cirrus.yml2
-rw-r--r--.copr/prepare.sh2
-rw-r--r--Dockerfile2
-rw-r--r--Dockerfile.centos2
-rw-r--r--Dockerfile.fedora2
-rw-r--r--contrib/spec/podman.spec.in2
6 files changed, 6 insertions, 6 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index 578a3eef0..75b6fba8a 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -43,7 +43,7 @@ env:
# Git commits to use while building dependencies into cache-images
FEDORA_CNI_COMMIT: "412b6d31280682bb4fab4446f113c22ff1886554"
CNI_COMMIT: "7480240de9749f9a0a5c8614b17f1f03e0c06ab9"
- CONMON_COMMIT: "3e47d8dd45cdd973dbe256292d5e9c0bff195e56"
+ CONMON_COMMIT: "6f3572558b97bc60dd8f8c7f0807748e6ce2c440"
CRIU_COMMIT: "c74b83cd49c00589c0c0468ba5fe685b67fdbd0a"
# Special image w/ nested-libvirt + tools for creating new cache and base images
IMAGE_BUILDER_CACHE_IMAGE_NAME: "image-builder-image-1541772081"
diff --git a/.copr/prepare.sh b/.copr/prepare.sh
index 02444efa2..d8ad34d08 100644
--- a/.copr/prepare.sh
+++ b/.copr/prepare.sh
@@ -29,4 +29,4 @@ fi
mkdir build/
git archive --prefix "libpod-${COMMIT_SHORT}/" --format "tar.gz" HEAD -o "build/libpod-${COMMIT_SHORT}.tar.gz"
git clone https://github.com/containers/conmon
-cd conmon && git checkout 3e47d8dd45cdd973dbe256292d5e9c0bff195e56 && git archive --prefix "conmon/" --format "tar.gz" HEAD -o "../build/conmon.tar.gz"
+cd conmon && git checkout 6f3572558b97bc60dd8f8c7f0807748e6ce2c440 && git archive --prefix "conmon/" --format "tar.gz" HEAD -o "../build/conmon.tar.gz"
diff --git a/Dockerfile b/Dockerfile
index cc3ee00e0..ca7807fa1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -56,7 +56,7 @@ RUN set -x \
&& rm -rf "$GOPATH"
# Install conmon
-ENV CONMON_COMMIT 3e47d8dd45cdd973dbe256292d5e9c0bff195e56
+ENV CONMON_COMMIT 6f3572558b97bc60dd8f8c7f0807748e6ce2c440
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/containers/conmon.git "$GOPATH/src/github.com/containers/conmon.git" \
diff --git a/Dockerfile.centos b/Dockerfile.centos
index 65dbefb38..bbb582840 100644
--- a/Dockerfile.centos
+++ b/Dockerfile.centos
@@ -50,7 +50,7 @@ RUN set -x \
&& go get github.com/onsi/gomega/...
# Install conmon
-ENV CONMON_COMMIT 3e47d8dd45cdd973dbe256292d5e9c0bff195e56
+ENV CONMON_COMMIT 6f3572558b97bc60dd8f8c7f0807748e6ce2c440
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/containers/conmon.git "$GOPATH/src/github.com/containers/conmon.git" \
diff --git a/Dockerfile.fedora b/Dockerfile.fedora
index dafd3b6ad..54ab690e9 100644
--- a/Dockerfile.fedora
+++ b/Dockerfile.fedora
@@ -53,7 +53,7 @@ RUN set -x \
&& go get github.com/onsi/gomega/...
# Install conmon
-ENV CONMON_COMMIT 3e47d8dd45cdd973dbe256292d5e9c0bff195e56
+ENV CONMON_COMMIT 6f3572558b97bc60dd8f8c7f0807748e6ce2c440
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/containers/conmon.git "$GOPATH/src/github.com/containers/conmon.git" \
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index ce5901f69..9d8467783 100644
--- a/contrib/spec/podman.spec.in
+++ b/contrib/spec/podman.spec.in
@@ -35,7 +35,7 @@
# People want conmon packaged with the copr rpm
%global import_path_conmon github.com/containers/conmon
%global git_conmon https://%{import_path_conmon}
-%global commit_conmon 3e47d8dd45cdd973dbe256292d5e9c0bff195e56
+%global commit_conmon 6f3572558b97bc60dd8f8c7f0807748e6ce2c440
%global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7})
Name: podman