diff options
| author | Sorin Sbarnea <ssbarnea@redhat.com> | 2019-12-04 10:11:31 +0000 |
|---|---|---|
| committer | Sorin Sbarnea <ssbarnea@redhat.com> | 2019-12-04 21:44:11 +0000 |
| commit | b8ac3f143be8ee8ad29d9fa5586cca5767776584 (patch) | |
| tree | f880f4c892187f615c5e4c1410199c286240a2cf /Dockerfile | |
| parent | 4dbab37e05d7daff858a8b1b968240dcf729d35a (diff) | |
| download | podman-b8ac3f143be8ee8ad29d9fa5586cca5767776584.tar.gz podman-b8ac3f143be8ee8ad29d9fa5586cca5767776584.tar.bz2 podman-b8ac3f143be8ee8ad29d9fa5586cca5767776584.zip | |
Avoid git warnings by using detach on checkout
Git displays a huge and confusing warning when doing a checkout of
a specific commit if the --detach option is not mentioned.
This cleans up our build logs, making it easier to spot real problems.
Signed-off-by: Sorin Sbarnea <ssbarnea@redhat.com>
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 \ |