Merge pull request #40 from docksal/develop

Release 1.4.2

Makefile

@@ -5,7 +5,9 @@ VERSION ?= dev
 REPO = docksal/vhost-proxy
 NAME = docksal-vhost-proxy
 
-.PHONY: build test push shell run start stop logs debug clean release
+.EXPORT_ALL_VARIABLES:
+
+.PHONY: build exec test push shell run start stop logs debug clean release
 
 build:
 	docker build -t ${REPO}:${VERSION} .

scripts/release.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+if [[ "${TRAVIS_PULL_REQUEST}" == "false" ]]; then
+	# develop => edge
+	[[ "${TRAVIS_BRANCH}" == "develop" ]] && TAG="edge"
+	# master => latest
+	[[ "${TRAVIS_BRANCH}" == "master" ]] && TAG="latest"
+	# tags/v1.2.0 => 1.2
+	[[ "${TRAVIS_TAG}" != "" ]] && TAG="${TRAVIS_TAG:1:3}"
+
+	if [[ "$TAG" != "" ]]; then
+		docker login -u "${DOCKER_USER}" -p "${DOCKER_PASS}"
+		docker tag ${REPO}:dev ${REPO}:${TAG}
+		docker push ${REPO}:${TAG}
+	fi;
+fi;