Merge branch 'develop'

.travis.yml

@@ -3,10 +3,11 @@ dist: bionic
 language: minimal
 
 env:
-  DOCKSAL_VERSION: develop
-  # Setting these while testing locally may result in data loss, so only use in CI.
-  PROJECT_INACTIVITY_TIMEOUT: 30s
-  PROJECT_DANGLING_TIMEOUT: 60s
+  global:
+    - DOCKSAL_VERSION=develop
+    # Setting these while testing locally may result in data loss, so only use in CI.
+    - PROJECT_INACTIVITY_TIMEOUT=30s
+    - PROJECT_DANGLING_TIMEOUT=60s
 
 install:
   # Install Docksal to have a matching versions of Docker on the build host
@@ -22,7 +23,6 @@ script:
   - make
   - make start
   - make exec -e CMD="env"  # Views env variables picked up by proxy
-  - make exec -e CMD="ls -la /projects" # View the contents of the /projects folder
   - make test
 
 after_success:

Makefile

@@ -2,11 +2,11 @@
 DOCKER ?= docker
 
 ifeq ($(VERSION),)
-    VERSION = dev
-    LATEST_VERSION = $(VERSION)
+	VERSION = dev
+	LATEST_VERSION = $(VERSION)
 endif
 
-TAG ?= $(VERSION)
+BUILD_TAG ?= $(VERSION)
 
 REPO = docksal/vhost-proxy
 NAME = docksal-vhost-proxy
@@ -36,15 +36,15 @@ ARGS = $(filter-out $@,$(MAKECMDGOALS))
 default: build
 
 build:
-	$(DOCKER) build -t $(REPO):$(TAG) .
+	$(DOCKER) build -t $(REPO):$(BUILD_TAG) .
 
 test:
 	# Create test projects before starting tests. This allows using "fin @project" aliases in tests.
 	tests/create_test_projects.sh
-	IMAGE=$(REPO):$(TAG) tests/test.bats
+	IMAGE=$(REPO):$(BUILD_TAG) tests/test.bats
 
 push:
-	$(DOCKER) push $(REPO):$(TAG)
+	$(DOCKER) push $(REPO):$(BUILD_TAG)
 
 conf-vhosts:
 	make exec -e CMD='cat /etc/nginx/conf.d/vhosts.conf'
@@ -55,7 +55,7 @@ start: clean
 	mkdir -p $(PROJECTS_ROOT)
 	# Copy custom certs used in cert tets
 	cp -R tests/certs ~/.docksal
-	IMAGE_VHOST_PROXY=$(REPO):$(TAG) fin system reset vhost-proxy
+	IMAGE_VHOST_PROXY=$(REPO):$(BUILD_TAG) fin system reset vhost-proxy
 	# Give vhost-proxy a bit of time to initialize
 	sleep ${DELAY}
 	# Stop crond, so it does not interfere with tests
@@ -93,7 +93,7 @@ clean:
 	rm -f ~/.docksal/certs/example.com.*
 
 release:
-	@scripts/release.sh
+	@scripts/docker-push.sh
 
 # https://stackoverflow.com/a/6273809/1826109
 %: