IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "build: fixes docker push."

Browse Source 
This reverts commit be57f6878c.
This commit is contained in:
Leonard Gram 2019-01-09 16:14:03 +01:00
parent be57f6878c
commit a237a495b0
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packaging/docker/build.sh
View File

@ -1,13 +1,14 @@
#!/bin/sh
_grafana_tag=${1:-}
_docker_repo=${2:-grafana/grafana}
_grafana_tag=$1
# If the tag starts with v, treat this as a official release
if echo "$_grafana_tag" | grep -q "^v"; then
_grafana_version=$(echo "${_grafana_tag}" | cut -d "v" -f 2)
_docker_repo=${2:-grafana/grafana}
else
_grafana_version=$_grafana_tag
_docker_repo=${2:-grafana/grafana-dev}
fi
echo "Building ${_docker_repo}:${_grafana_version}"
@ -44,6 +45,5 @@ docker_build "arm64v8/debian:stretch-slim" "grafana-latest.linux-arm64.tar.gz" "
if echo "$_grafana_tag" | grep -q "^v"; then
docker_tag_all "${_docker_repo}" "latest"
else
docker_tag_all "${_docker_repo}" "master"
docker tag "${_docker_repo}:${_grafana_version} grafana/grafana-dev:${_grafana_version}"
docker_tag_all "grafana/grafana" "master"
fi

11
packaging/docker/push_to_docker_hub.sh
View File

@ -1,14 +1,15 @@
#!/bin/sh
set -e
_grafana_tag=${1:-}
_docker_repo=${2:-grafana/grafana}
_grafana_tag=$1
# If the tag starts with v, treat this as a official release
if echo "$_grafana_tag" | grep -q "^v"; then
_grafana_version=$(echo "${_grafana_tag}" | cut -d "v" -f 2)
_docker_repo=${2:-grafana/grafana}
else
_grafana_version=$_grafana_tag
_docker_repo=${2:-grafana/grafana-dev}
fi
export DOCKER_CLI_EXPERIMENTAL=enabled
@ -34,13 +35,11 @@ docker_push_all () {
docker manifest push "${repo}:${tag}"
}
docker_push_all "${_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_all "${_docker_repo}" "${_grafana_version}"
elif echo "$_grafana_tag" | grep -q "^v" && echo "$_grafana_tag" | grep -q "beta"; then
docker_push_all "${_docker_repo}" "${_grafana_version}"
elif echo "$_grafana_tag" | grep -q "master"; then
docker_push_all "grafana/grafana" "master"
docker push "grafana/grafana-dev:${_grafana_version}"
fi