Revert "Docker image for ARM"

This reverts commit 5f7e6a5c73.

packaging/docker/Dockerfile

@@ -1,5 +1,4 @@
-ARG BASE_IMAGE=debian:stretch-slim
-FROM ${BASE_IMAGE}
+FROM debian:stretch-slim
 
 ARG GRAFANA_TGZ="grafana-latest.linux-x64.tar.gz"
 
@@ -11,8 +10,7 @@ COPY ${GRAFANA_TGZ} /tmp/grafana.tar.gz
 
 RUN mkdir /tmp/grafana && tar xfvz /tmp/grafana.tar.gz --strip-components=1 -C /tmp/grafana
 
-ARG BASE_IMAGE=debian:stretch-slim
-FROM ${BASE_IMAGE}
+FROM debian:stretch-slim
 
 ARG GF_UID="472"
 ARG GF_GID="472"

packaging/docker/build.sh

@@ -13,37 +13,13 @@ fi
 
 echo "Building ${_docker_repo}:${_grafana_version}"
 
-export DOCKER_CLI_EXPERIMENTAL=enabled
-
-# Build grafana image for a specific arch
-docker_build () {
-	base_image=$1
-	grafana_tgz=$2
-	tag=$3
-
-  docker build \
-		--build-arg BASE_IMAGE=${base_image} \
-		--build-arg GRAFANA_TGZ=${grafana_tgz} \
-		--tag "${tag}" \
-		--no-cache=true .
-}
-
-# Tag docker images of all architectures
-docker_tag_all () {
-	repo=$1
-	tag=$2
-	docker tag "${_docker_repo}:${_grafana_version}" "${repo}:${tag}"
-	docker tag "${_docker_repo}-arm32v7-linux:${_grafana_version}" "${repo}-arm32v7-linux:${tag}"
-	docker tag "${_docker_repo}-arm64v8-linux:${_grafana_version}" "${repo}-arm64v8-linux:${tag}"
-}
-
-docker_build "debian:stretch-slim" "grafana-latest.linux-x64.tar.gz" "${_docker_repo}:${_grafana_version}"
-docker_build "arm32v7/debian:stretch-slim" "grafana-latest.linux-armv7.tar.gz" "${_docker_repo}-arm32v7-linux:${_grafana_version}"
-docker_build "arm64v8/debian:stretch-slim" "grafana-latest.linux-arm64.tar.gz" "${_docker_repo}-arm64v8-linux:${_grafana_version}"
+docker build \
+	--tag "${_docker_repo}:${_grafana_version}" \
+	--no-cache=true .
 
 # Tag as 'latest' for official release; otherwise tag as grafana/grafana:master
 if echo "$_grafana_tag" | grep -q "^v"; then
-	docker_tag_all "${_docker_repo}" "latest"
+	docker tag "${_docker_repo}:${_grafana_version}" "${_docker_repo}:latest"
 else
-	docker_tag_all "grafana/grafana" "master"
+	docker tag "${_docker_repo}:${_grafana_version}" "grafana/grafana:master"
 fi

packaging/docker/push_to_docker_hub.sh

@@ -12,34 +12,13 @@ else
 	_docker_repo=${2:-grafana/grafana-dev}
 fi
 
-export DOCKER_CLI_EXPERIMENTAL=enabled
-
 echo "pushing ${_docker_repo}:${_grafana_version}"
-
-
-docker_push_all () {
-	repo=$1
-	tag=$2
-
-	# Push each image individually
-	docker push "${repo}:${tag}"
-	docker push "${repo}-arm32v7-linux:${tag}"
-	docker push "${repo}-arm64v8-linux:${tag}"
-
-	# Create and push a multi-arch manifest
-	docker manifest create "${repo}:${tag}" \
-		"${repo}:${tag}" \
-  	"${repo}-arm32v7-linux:${tag}" \
-		"${repo}-arm64v8-linux:${tag}"
-
-	docker manifest push "${repo}:${tag}"
-}
-
-docker_push_all "${_docker_repo}" "${_grafana_version}"
+docker push "${_docker_repo}:${_grafana_version}"
 
 if echo "$_grafana_tag" | grep -q "^v" && echo "$_grafana_tag" | grep -vq "beta"; then
 	echo "pushing ${_docker_repo}:latest"
-	docker_push_all "${_docker_repo}" "latest"
+	docker push "${_docker_repo}:latest"
 elif echo "$_grafana_tag" | grep -q "master"; then
-	docker_push_all "grafana/grafana" "master"
+	echo "pushing grafana/grafana:master"
+	docker push grafana/grafana:master
 fi