From 4e80543edbdceebbcf4a06e60ca3fc8e76d74920 Mon Sep 17 00:00:00 2001 From: Felix Date: Tue, 21 Apr 2020 19:19:10 +0200 Subject: [PATCH] Update test_deploy.sh, supporting different branches --- docker/dev/test_deploy.sh | 17 +++++++++++------ 1 file 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 -- 2.44.1