Merge remote-tracking branch 'origin/master' into image-improvements

* origin/master:
  make a target docker repo an optional param
  Only pushes to the latest tag for releases.
  Add workdir to dockerfile

Dockerfile

@@ -35,5 +35,5 @@ EXPOSE 3000
 COPY ./run.sh /run.sh
 
 USER grafana
-
-ENTRYPOINT [ "/run.sh" ]
+WORKDIR /
+ENTRYPOINT [ "/run.sh" ]

build.sh

@@ -2,14 +2,15 @@
 
 _grafana_version=$1
 
+_docker_repo=${2:-grafana/grafana}
+
 if [ "$_grafana_version" != "" ]; then
 	echo "Building version ${_grafana_version}"
 	docker build \
 		--build-arg GRAFANA_VERSION=${_grafana_version} \
-		--tag "grafana/grafana:${_grafana_version}" \
+		--tag "${_docker_repo}:${_grafana_version}" \
 		--no-cache=true .
-	docker tag grafana/grafana:${_grafana_version} grafana/grafana:latest
-
+	docker tag ${_docker_repo}:${_grafana_version} ${_docker_repo}:latest
 else
 	echo "Building latest for master"
 	docker build \

push_to_docker_hub.sh

@@ -6,7 +6,11 @@ _grafana_version=${_grafana_tag:1}
 if [ "$_grafana_version" != "" ]; then
 	echo "pushing grafana/grafana:${_grafana_version}"
 	docker push grafana/grafana:${_grafana_version}
-	docker push grafana/grafana:latest
+
+	if echo "$_grafana_version" | grep -viqF beta; then
+		echo "pushing grafana/grafana:latest"
+		docker push grafana/grafana:latest
+	fi
 else
 	echo "pushing grafana/grafana:master"
 	docker push grafana/grafana:master