summaryrefslogtreecommitdiffstats
path: root/docker/build.sh
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-12-28 14:42:52 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-12-28 14:42:52 +0000
commit12b9efaebb6d008437af4a72a98d05c4319fc825 (patch)
tree70876046e52ae898dd7327424f2c27fde1a5d45f /docker/build.sh
parentReleasing debian version 1.11.0+dfsg-1~exp1. (diff)
downloadnetdata-12b9efaebb6d008437af4a72a98d05c4319fc825.tar.xz
netdata-12b9efaebb6d008437af4a72a98d05c4319fc825.zip
Merging upstream version 1.11.1+dfsg
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'docker/build.sh')
-rwxr-xr-xdocker/build.sh15
1 files changed, 3 insertions, 12 deletions
diff --git a/docker/build.sh b/docker/build.sh
index 908468d39..faaa2db79 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -30,7 +30,9 @@ fi
# Build images using multi-arch Dockerfile.
for ARCH in i386 armhf aarch64 amd64; do
- docker build --build-arg ARCH="${ARCH}-v3.8" --tag "${REPOSITORY}:${VERSION}-${ARCH}" --file docker/Dockerfile ./ &
+ docker build --build-arg ARCH="${ARCH}-v3.8" \
+ --tag "${REPOSITORY}:${VERSION}-${ARCH}" \
+ --file docker/Dockerfile ./ &
done
wait
@@ -70,14 +72,3 @@ docker --config /tmp/docker manifest push -p "${REPOSITORY}:${VERSION}"
# Show current manifest (debugging purpose only)
docker --config /tmp/docker manifest inspect "${REPOSITORY}:${VERSION}"
-# Push netdata images to firehol organization
-# TODO: Remove it after we decide to deprecate firehol/netdata docker repo
-if [ "$REPOSITORY" != "netdata" ]; then
- echo "$OLD_DOCKER_PASSWORD" | docker login -u "$OLD_DOCKER_USERNAME" --password-stdin
- for ARCH in amd64 i386 armhf aarch64; do
- docker tag "${REPOSITORY}:${VERSION}-${ARCH}" "firehol/netdata:${ARCH}"
- docker push "firehol/netdata:${ARCH}"
- done
- docker tag "${REPOSITORY}:${VERSION}-amd64" "firehol/netdata:${VERSION}"
- docker push "firehol/netdata:${VERSION}"
-fi