containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3321 from haircommander/conmon-0.3.0 

bump conmon to 0.3.0
This commit is contained in:
OpenShift Merge Robot 2019-06-14 05:34:39 +02:00 committed by GitHub
parent 56957db468 ef9e0ec6cb
commit d5f04e920b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.cirrus.yml
View File

@ -31,9 +31,9 @@ env:
####
#### Cache-image names to test with
###
FEDORA_CACHE_IMAGE_NAME: "fedora-29-libpod-5157899144265728"
PRIOR_FEDORA_CACHE_IMAGE_NAME: "fedora-28-libpod-5157899144265728"
UBUNTU_CACHE_IMAGE_NAME: "ubuntu-18-libpod-5157899144265728"
FEDORA_CACHE_IMAGE_NAME: "fedora-29-libpod-4844850202017792"
PRIOR_FEDORA_CACHE_IMAGE_NAME: "fedora-28-libpod-4844850202017792"
UBUNTU_CACHE_IMAGE_NAME: "ubuntu-18-libpod-4844850202017792"
####
#### Variables for composing new cache-images (used in PR testing) from
@ -43,7 +43,7 @@ env:
# Git commits to use while building dependencies into cache-images
FEDORA_CNI_COMMIT: "412b6d31280682bb4fab4446f113c22ff1886554"
CNI_COMMIT: "7480240de9749f9a0a5c8614b17f1f03e0c06ab9"
CONMON_COMMIT: "f02c053eb37010fc76d1e2966de7f2cb9f969ef2"
CONMON_COMMIT: "8455ce1ef385120deb827d0f0588c04357bad4c4"
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"

2
.copr/prepare.sh
View File

@ -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 59952292a3b07ac125575024ae21956efe0ecdfb && git archive --prefix "conmon/" --format "tar.gz" HEAD -o "../build/conmon.tar.gz"
cd conmon && git checkout 8455ce1ef385120deb827d0f0588c04357bad4c4 && git archive --prefix "conmon/" --format "tar.gz" HEAD -o "../build/conmon.tar.gz"

2
Dockerfile
View File

@ -56,7 +56,7 @@ RUN set -x \
&& rm -rf "$GOPATH"
# Install conmon
ENV CONMON_COMMIT 59952292a3b07ac125575024ae21956efe0ecdfb
ENV CONMON_COMMIT 8455ce1ef385120deb827d0f0588c04357bad4c4
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/containers/conmon.git "$GOPATH/src/github.com/containers/conmon.git" \

2
Dockerfile.centos
View File

@ -50,7 +50,7 @@ RUN set -x \
&& go get github.com/onsi/gomega/...
# Install conmon
ENV CONMON_COMMIT 59952292a3b07ac125575024ae21956efe0ecdfb
ENV CONMON_COMMIT 8455ce1ef385120deb827d0f0588c04357bad4c4
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/containers/conmon.git "$GOPATH/src/github.com/containers/conmon.git" \

2
Dockerfile.fedora
View File

@ -54,7 +54,7 @@ RUN set -x \
&& go get github.com/onsi/gomega/...
# Install conmon
ENV CONMON_COMMIT 59952292a3b07ac125575024ae21956efe0ecdfb
ENV CONMON_COMMIT 8455ce1ef385120deb827d0f0588c04357bad4c4
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/containers/conmon.git "$GOPATH/src/github.com/containers/conmon.git" \

2
contrib/spec/podman.spec.in
View File

@ -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 59952292a3b07ac125575024ae21956efe0ecdfb
%global commit_conmon 8455ce1ef385120deb827d0f0588c04357bad4c4
%global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7})
Name: podman