summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorFelix <me@nutomic.com>2020-04-21 19:19:10 +0200
committerFelix <me@nutomic.com>2020-04-21 19:19:10 +0200
commit4e80543edbdceebbcf4a06e60ca3fc8e76d74920 (patch)
tree06ff1f93ce35a3eb1fbb6a890318acdeceacbec8 /docker
parenta90b16a72cca05272027394883b5813b6ba1bbd3 (diff)
Update test_deploy.sh, supporting different branches
Diffstat (limited to 'docker')
-rwxr-xr-xdocker/dev/test_deploy.sh17
1 files changed, 11 insertions, 6 deletions
diff --git a/docker/dev/test_deploy.sh b/docker/dev/test_deploy.sh
index 1ae91f65..fb09e4f1 100755
--- a/docker/dev/test_deploy.sh
+++ b/docker/dev/test_deploy.sh
@@ -1,11 +1,16 @@
-#!/bin/sh
+#!/bin/bash
+set -e
+
+BRANCH=$1
+
+git checkout $BRANCH
+cd ../../
# 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