Merge branch 'more-tests' into 'master'

Draft: add test with tag

See merge request pub/make-deploy!9

test.sh

@@ -30,7 +30,7 @@ function test_with_minimal_vars_compose(){
   cp $TESTS/compose_config.mk config.mk
   cp $TESTS/docker-compose.yml .
   make deploy
-  rm -f docker-compose.yml
+  rm -f docker-compose.yml config.mk
 }
 
 function test_with_minimal_vars_compose_file(){
@@ -38,7 +38,16 @@ function test_with_minimal_vars_compose_file(){
   cp $TESTS/compose_file_config.mk config.mk
   cp $TESTS/docker-compose.yml .
   make deploy
-  rm -f docker-compose.yml
+  rm -f docker-compose.yml config.mk
+}
+
+function test_with_minimal_vars_compose_and_tag(){
+  echo "::::::::: $FUNCNAME ::::::::::::"
+  cp $TESTS/compose_config.tag.mk config.mk
+  cp $TESTS/docker-compose.tag.yml docker-compose.yml
+  echo "TAG=3.17" > .env
+  make deploy
+  rm -f docker-compose.yml config.mk
 }
 
 prepdir
@@ -46,5 +55,6 @@ prepdir
 test_with_minimal_vars_apt
 test_with_minimal_vars_compose
 test_with_minimal_vars_compose_file
+test_with_minimal_vars_compose_and_tag
 
 cleandir

testing/compose_config.tag.mk

@@ -0,0 +1,5 @@
+DEPLOY_NAME = make-deploy-test-compose-tag
+DEPLOY_PATH = /tmp
+DEPLOY_HOSTS = localhost
+DEPLOY_TYPE = compose
+SSH_USER = $(USER)

testing/docker-compose.tag.yml

@@ -0,0 +1,4 @@
+services:
+  curl:
+    image: "alpine:${TAG}"
+    command: cat /etc/os-release