opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-03 09:17:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3210 from haircommander/conmon-0.2.0

Browse Source 
bump conmon to v0.2.0
This commit is contained in:
OpenShift Merge Robot
2019-05-28 21:07:43 +02:00
committed by GitHub
parent bc7afd6d71 f2c8391ecc
commit 8649dbdc11
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,7 @@ RUN set -x \
&& install -D -m 755 "$GOPATH"/bin/easyjson /usr/bin/ && install -D -m 755 "$GOPATH"/bin/easyjson /usr/bin/
# Install conmon # Install conmon
ENV CONMON_COMMIT f02c053eb37010fc76d1e2966de7f2cb9f969ef2 ENV CONMON_COMMIT 59952292a3b07ac125575024ae21956efe0ecdfb
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

@ -68,7 +68,7 @@ RUN set -x \
&& install -D -m 755 "$GOPATH"/bin/easyjson /usr/bin/ && install -D -m 755 "$GOPATH"/bin/easyjson /usr/bin/
# Install conmon # Install conmon
ENV CONMON_COMMIT f02c053eb37010fc76d1e2966de7f2cb9f969ef2 ENV CONMON_COMMIT 59952292a3b07ac125575024ae21956efe0ecdfb
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 f02c053eb37010fc76d1e2966de7f2cb9f969ef2 %global commit_conmon 59952292a3b07ac125575024ae21956efe0ecdfb
%global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7})
Name: podman Name: podman