mirror of
https://github.com/containers/podman
synced 2024-10-20 01:03:51 +00:00
Merge pull request #3398 from haircommander/conmon-hotfix
Update conmon to include attach socket unlink
This commit is contained in:
commit
cf244d87cd
|
@ -29,9 +29,9 @@ env:
|
|||
####
|
||||
#### Cache-image names to test with
|
||||
###
|
||||
FEDORA_CACHE_IMAGE_NAME: "fedora-30-libpod-5156500369047552"
|
||||
PRIOR_FEDORA_CACHE_IMAGE_NAME: "fedora-29-libpod-5156500369047552"
|
||||
UBUNTU_CACHE_IMAGE_NAME: "ubuntu-18-libpod-5156500369047552"
|
||||
FEDORA_CACHE_IMAGE_NAME: "fedora-30-libpod-5699414987898880"
|
||||
PRIOR_FEDORA_CACHE_IMAGE_NAME: "fedora-29-libpod-5699414987898880"
|
||||
UBUNTU_CACHE_IMAGE_NAME: "ubuntu-18-libpod-5699414987898880"
|
||||
|
||||
####
|
||||
#### Variables for composing new cache-images (used in PR testing) from
|
||||
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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" \
|
||||
|
|
|
@ -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" \
|
||||
|
|
|
@ -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" \
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue