diff options
| author | Paweł Krupa <pawel@krupa.net.pl> | 2019-01-17 21:20:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-17 21:20:41 +0100 |
| commit | 698721a59f16a2d856043206e8f3d65a210b3ab4 (patch) | |
| tree | 881c733901aae14a39fa861fd937e5f3be05cd08 | |
| parent | b81bba75f1fc6f275d0acb4a3fc68a7b8c062c65 (diff) | |
allow less verbose container image build (#5187)
[netdata release candidate]
| -rw-r--r-- | packaging/docker/Dockerfile | 4 | ||||
| -rwxr-xr-x | packaging/docker/build.sh | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile index 4e4b72c00e..b1d3501f97 100644 --- a/packaging/docker/Dockerfile +++ b/packaging/docker/Dockerfile @@ -6,6 +6,7 @@ ARG ARCH=amd64-v3.8 FROM multiarch/alpine:${ARCH} as builder +ARG OUTPUT="/dev/stdout" # Install prerequisites RUN apk --no-cache add alpine-sdk \ autoconf \ @@ -33,8 +34,7 @@ WORKDIR /opt/netdata.git # Install from source RUN chmod +x netdata-installer.sh && \ - sync && sleep 1 && \ - ./netdata-installer.sh --dont-wait --dont-start-it + ./netdata-installer.sh --dont-wait --dont-start-it &>${OUTPUT} # files to one directory RUN mkdir -p /app/usr/sbin/ \ diff --git a/packaging/docker/build.sh b/packaging/docker/build.sh index f0ea5c7385..e801830639 100755 --- a/packaging/docker/build.sh +++ b/packaging/docker/build.sh @@ -39,9 +39,11 @@ docker run --rm --privileged multiarch/qemu-user-static:register --reset # Build images using multi-arch Dockerfile. for ARCH in "${ARCHITECTURES[@]}"; do - eval docker build --build-arg ARCH="${ARCH}-v3.8" \ - --tag "${REPOSITORY}:${VERSION}-${ARCH}" \ - --file packaging/docker/Dockerfile ./ ${BG} + eval docker build \ + --build-arg ARCH="${ARCH}-v3.8" \ + --build-arg OUTPUT=/dev/null \ + --tag "${REPOSITORY}:${VERSION}-${ARCH}" \ + --file packaging/docker/Dockerfile ./ ${BG} done wait |