container/podman
container/podman
1
0
Fork 0
mirror of https://github.com/containers/podman synced 2024-10-19 16:54:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update conmon to include attach socket unlink

Browse source 
Signed-off-by: Peter Hunt <pehunt@redhat.com>
This commit is contained in:
Peter Hunt 2019-06-21 10:55:24 -04:00
parent c0bc768ff1
commit 284208a238
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.cirrus.yml
View file

@ -41,7 +41,7 @@ env:
# Git commits to use while building dependencies into cache-images
FEDORA_CNI_COMMIT: "412b6d31280682bb4fab4446f113c22ff1886554"
CNI_COMMIT: "7480240de9749f9a0a5c8614b17f1f03e0c06ab9"
CONMON_COMMIT: "8455ce1ef385120deb827d0f0588c04357bad4c4"
CONMON_COMMIT: "3e47d8dd45cdd973dbe256292d5e9c0bff195e56"
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 8455ce1ef385120deb827d0f0588c04357bad4c4 && git archive --prefix "conmon/" --format "tar.gz" HEAD -o "../build/conmon.tar.gz"
cd conmon && git checkout 3e47d8dd45cdd973dbe256292d5e9c0bff195e56 && 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 8455ce1ef385120deb827d0f0588c04357bad4c4
ENV CONMON_COMMIT 3e47d8dd45cdd973dbe256292d5e9c0bff195e56
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 8455ce1ef385120deb827d0f0588c04357bad4c4
ENV CONMON_COMMIT 3e47d8dd45cdd973dbe256292d5e9c0bff195e56
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

@ -53,7 +53,7 @@ RUN set -x \
&& go get github.com/onsi/gomega/...
# Install conmon
ENV CONMON_COMMIT 8455ce1ef385120deb827d0f0588c04357bad4c4
ENV CONMON_COMMIT 3e47d8dd45cdd973dbe256292d5e9c0bff195e56
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 8455ce1ef385120deb827d0f0588c04357bad4c4
%global commit_conmon 3e47d8dd45cdd973dbe256292d5e9c0bff195e56
%global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7})
Name: podman