diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-12-05 07:22:41 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-05 07:22:41 -0800 |
| commit | ae839dad5add84b5b6ffd4260987d08441196986 (patch) | |
| tree | 33feff61c9fa36190a49df42b17d2f188cb72a3a /Dockerfile.centos | |
| parent | 813b00e439c4cb200dc02f57ebcf889c6f5afe5b (diff) | |
| parent | b8ac3f143be8ee8ad29d9fa5586cca5767776584 (diff) | |
| download | podman-ae839dad5add84b5b6ffd4260987d08441196986.tar.gz podman-ae839dad5add84b5b6ffd4260987d08441196986.tar.bz2 podman-ae839dad5add84b5b6ffd4260987d08441196986.zip | |
Merge pull request #4638 from ssbarnea/fix/detach
Avoid git warnings by using detach on checkout
Diffstat (limited to 'Dockerfile.centos')
| -rw-r--r-- | Dockerfile.centos | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Dockerfile.centos b/Dockerfile.centos index 7c2a05dd1..f5a2b891c 100644 --- a/Dockerfile.centos +++ b/Dockerfile.centos @@ -35,7 +35,7 @@ RUN set -x \ && export GOPATH="$(mktemp -d)" GOCACHE="$(mktemp -d)" \ && git clone https://github.com/containernetworking/plugins.git "$GOPATH/src/github.com/containernetworking/plugins" \ && cd "$GOPATH/src/github.com/containernetworking/plugins" \ - && git checkout -q "$CNI_COMMIT" \ + && git checkout --detach -q "$CNI_COMMIT" \ && ./build_linux.sh \ && mkdir -p /usr/libexec/cni \ && cp bin/* /usr/libexec/cni \ @@ -59,7 +59,7 @@ RUN set -x \ && git clone https://github.com/containers/conmon.git "$GOPATH/src/github.com/containers/conmon.git" \ && cd "$GOPATH/src/github.com/containers/conmon.git" \ && git fetch origin --tags \ - && git checkout -q "$CONMON_COMMIT" \ + && git checkout --detach -q "$CONMON_COMMIT" \ && make \ && install -D -m 755 bin/conmon /usr/libexec/podman/conmon \ && rm -rf "$GOPATH" |