Build: Build Ubuntu based Docker images also for ARM (#20267)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
@@ -2,11 +2,13 @@
|
||||
set -e
|
||||
|
||||
UBUNTU_BASE=0
|
||||
TAG_SUFFIX=""
|
||||
|
||||
while [ "$1" != "" ]; do
|
||||
case "$1" in
|
||||
"--ubuntu")
|
||||
UBUNTU_BASE=1
|
||||
TAG_SUFFIX="-ubuntu"
|
||||
echo "Ubuntu base image enabled"
|
||||
shift
|
||||
;;
|
||||
@@ -29,60 +31,39 @@ fi
|
||||
|
||||
export DOCKER_CLI_EXPERIMENTAL=enabled
|
||||
|
||||
if [ $UBUNTU_BASE = "0" ]; then
|
||||
echo "pushing ${_docker_repo}:${_grafana_version}"
|
||||
else
|
||||
echo "pushing ${_docker_repo}:${_grafana_version}-ubuntu"
|
||||
fi
|
||||
|
||||
echo "pushing ${_docker_repo}:${_grafana_version}${TAG_SUFFIX}"
|
||||
|
||||
docker_push_all () {
|
||||
repo=$1
|
||||
tag=$2
|
||||
|
||||
if [ $UBUNTU_BASE = "0" ]; then
|
||||
# Push each image individually
|
||||
docker push "${repo}:${tag}"
|
||||
docker push "${repo}-arm32v7-linux:${tag}"
|
||||
docker push "${repo}-arm64v8-linux:${tag}"
|
||||
# Push each image individually
|
||||
docker push "${repo}:${tag}${TAG_SUFFIX}"
|
||||
docker push "${repo}-arm32v7-linux:${tag}${TAG_SUFFIX}"
|
||||
docker push "${repo}-arm64v8-linux:${tag}${TAG_SUFFIX}"
|
||||
|
||||
# Create and push a multi-arch manifest
|
||||
docker manifest create "${repo}:${tag}" \
|
||||
"${repo}:${tag}" \
|
||||
"${repo}-arm32v7-linux:${tag}" \
|
||||
"${repo}-arm64v8-linux:${tag}"
|
||||
# Create and push a multi-arch manifest
|
||||
docker manifest create "${repo}:${tag}${TAG_SUFFIX}" \
|
||||
"${repo}:${tag}${TAG_SUFFIX}" \
|
||||
"${repo}-arm32v7-linux:${tag}${TAG_SUFFIX}" \
|
||||
"${repo}-arm64v8-linux:${tag}${TAG_SUFFIX}"
|
||||
|
||||
docker manifest push "${repo}:${tag}"
|
||||
else
|
||||
docker push "${repo}:${tag}-ubuntu"
|
||||
fi
|
||||
docker manifest push "${repo}:${tag}${TAG_SUFFIX}"
|
||||
}
|
||||
|
||||
if echo "$_grafana_tag" | grep -q "^v" && echo "$_grafana_tag" | grep -vq "beta"; then
|
||||
echo "pushing ${_docker_repo}:latest"
|
||||
echo "pushing ${_docker_repo}:latest${TAG_SUFFIX}"
|
||||
docker_push_all "${_docker_repo}" "latest"
|
||||
docker_push_all "${_docker_repo}" "${_grafana_version}"
|
||||
# Push to the grafana-dev repository with the expected tag
|
||||
# for running the end to end tests successfully
|
||||
if [ ${UBUNTU_BASE} = "0" ]; then
|
||||
docker push "grafana/grafana-dev:${_grafana_tag}"
|
||||
else
|
||||
docker push "grafana/grafana-dev:${_grafana_tag}-ubuntu"
|
||||
fi
|
||||
docker push "grafana/grafana-dev:${_grafana_tag}${TAG_SUFFIX}"
|
||||
elif echo "$_grafana_tag" | grep -q "^v" && echo "$_grafana_tag" | grep -q "beta"; then
|
||||
docker_push_all "${_docker_repo}" "${_grafana_version}"
|
||||
# Push to the grafana-dev repository with the expected tag
|
||||
# for running the end to end tests successfully
|
||||
if [ ${UBUNTU_BASE} = "0" ]; then
|
||||
docker push "grafana/grafana-dev:${_grafana_tag}"
|
||||
else
|
||||
docker push "grafana/grafana-dev:${_grafana_tag}-ubuntu"
|
||||
fi
|
||||
docker push "grafana/grafana-dev:${_grafana_tag}${TAG_SUFFIX}"
|
||||
elif echo "$_grafana_tag" | grep -q "master"; then
|
||||
docker_push_all "${_docker_repo}" "master"
|
||||
if [ ${UBUNTU_BASE} = "0" ]; then
|
||||
docker push "grafana/grafana-dev:${_grafana_version}"
|
||||
else
|
||||
docker push "grafana/grafana-dev:${_grafana_version}-ubuntu"
|
||||
fi
|
||||
docker push "grafana/grafana-dev:${_grafana_version}${TAG_SUFFIX}"
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user