Merge branch 'master' into federation_merge_from_master_2

[lemmy.git] / docker / dev / test_deploy.sh

diff --git a/docker/dev/test_deploy.sh b/docker/dev/test_deploy.sh
index 1ae91f6541899c259e598410af3f13b9884058a5..c2ecc0c897578f4837d9830fd57350e1265a5a62 100755 (executable)
--- a/docker/dev/test_deploy.sh
+++ b/docker/dev/test_deploy.sh
@@ -1,11 +1,18 @@
-#!/bin/sh
+#!/bin/bash
+set -e
+
+BRANCH=$1
+
+git checkout $BRANCH
+
+export COMPOSE_DOCKER_CLI_BUILD=1
+export DOCKER_BUILDKIT=1
 
 # Rebuilding dev docker
-docker-compose build
-docker tag dev_lemmy:latest dessalines/lemmy:test
-docker push dessalines/lemmy:test
+sudo docker build . -f "docker/dev/Dockerfile" -t "dessalines/lemmy:$BRANCH"
+sudo docker push "dessalines/lemmy:$BRANCH"
 
 # Run the playbook
-pushd ../../../lemmy-ansible
-ansible-playbook -i test playbooks/site.yml --vault-password-file vault_pass
+pushd ../lemmy-ansible
+ansible-playbook -i test playbooks/site.yml
 popd