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 | |
| 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')
| -rw-r--r-- | Dockerfile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Dockerfile b/Dockerfile index a7d795b29..f85c47937 100644 --- a/Dockerfile +++ b/Dockerfile @@ -50,7 +50,7 @@ RUN set -x \ && git clone https://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ && cd "$GOPATH/src/github.com/opencontainers/runc" \ && git fetch origin --tags \ - && git checkout -q "$RUNC_COMMIT" \ + && git checkout --detach -q "$RUNC_COMMIT" \ && make static BUILDTAGS="seccomp selinux" \ && cp runc /usr/bin/runc \ && rm -rf "$GOPATH" @@ -62,7 +62,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" @@ -73,7 +73,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 \ |