opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-06 19:44:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3620 from haircommander/bump-conmon

Browse Source 
use conmon v1.0.0-rc2
This commit is contained in:
OpenShift Merge Robot
2019-07-22 21:43:59 +02:00
committed by GitHub
parent 69f74f13b0 0671dca90d
commit cf9efa90e5
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.cirrus.yml
View File

@ -43,7 +43,7 @@ env:
# Git commits to use while building dependencies into cache-images # Git commits to use while building dependencies into cache-images
FEDORA_CNI_COMMIT: "412b6d31280682bb4fab4446f113c22ff1886554" FEDORA_CNI_COMMIT: "412b6d31280682bb4fab4446f113c22ff1886554"
CNI_COMMIT: "7480240de9749f9a0a5c8614b17f1f03e0c06ab9" CNI_COMMIT: "7480240de9749f9a0a5c8614b17f1f03e0c06ab9"
CONMON_COMMIT: "3e47d8dd45cdd973dbe256292d5e9c0bff195e56" CONMON_COMMIT: "6f3572558b97bc60dd8f8c7f0807748e6ce2c440"
CRIU_COMMIT: "c74b83cd49c00589c0c0468ba5fe685b67fdbd0a" CRIU_COMMIT: "c74b83cd49c00589c0c0468ba5fe685b67fdbd0a"
# Special image w/ nested-libvirt + tools for creating new cache and base images # Special image w/ nested-libvirt + tools for creating new cache and base images
IMAGE_BUILDER_CACHE_IMAGE_NAME: "image-builder-image-1541772081" IMAGE_BUILDER_CACHE_IMAGE_NAME: "image-builder-image-1541772081"

2
.copr/prepare.sh
View File

@ -29,4 +29,4 @@ fi
mkdir build/ mkdir build/
git archive --prefix "libpod-${COMMIT_SHORT}/" --format "tar.gz" HEAD -o "build/libpod-${COMMIT_SHORT}.tar.gz" git archive --prefix "libpod-${COMMIT_SHORT}/" --format "tar.gz" HEAD -o "build/libpod-${COMMIT_SHORT}.tar.gz"
git clone https://github.com/containers/conmon 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"

2
Dockerfile
View File

@ -56,7 +56,7 @@ RUN set -x \
&& rm -rf "$GOPATH" && rm -rf "$GOPATH"
# Install conmon # Install conmon
ENV CONMON_COMMIT 3e47d8dd45cdd973dbe256292d5e9c0bff195e56 ENV CONMON_COMMIT 6f3572558b97bc60dd8f8c7f0807748e6ce2c440
RUN set -x \ RUN set -x \
&& export GOPATH="$(mktemp -d)" \ && export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/containers/conmon.git "$GOPATH/src/github.com/containers/conmon.git" \ && 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/... && go get github.com/onsi/gomega/...
# Install conmon # Install conmon
ENV CONMON_COMMIT 3e47d8dd45cdd973dbe256292d5e9c0bff195e56 ENV CONMON_COMMIT 6f3572558b97bc60dd8f8c7f0807748e6ce2c440
RUN set -x \ RUN set -x \
&& export GOPATH="$(mktemp -d)" \ && export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/containers/conmon.git "$GOPATH/src/github.com/containers/conmon.git" \ && git clone https://github.com/containers/conmon.git "$GOPATH/src/github.com/containers/conmon.git" \

2
Dockerfile.fedora
View File

@ -53,7 +53,7 @@ RUN set -x \
&& go get github.com/onsi/gomega/... && go get github.com/onsi/gomega/...
# Install conmon # Install conmon
ENV CONMON_COMMIT 3e47d8dd45cdd973dbe256292d5e9c0bff195e56 ENV CONMON_COMMIT 6f3572558b97bc60dd8f8c7f0807748e6ce2c440
RUN set -x \ RUN set -x \
&& export GOPATH="$(mktemp -d)" \ && export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/containers/conmon.git "$GOPATH/src/github.com/containers/conmon.git" \ && 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 # People want conmon packaged with the copr rpm
%global import_path_conmon github.com/containers/conmon %global import_path_conmon github.com/containers/conmon
%global git_conmon https://%{import_path_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}) %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7})
Name: podman Name: podman