summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDessalines <tyhou13@gmx.com>2020-04-14 10:07:40 -0400
committerDessalines <tyhou13@gmx.com>2020-04-14 10:07:40 -0400
commitb9aef5891fbb8191a0d9de5a40c23f7cfbd7c8f9 (patch)
tree02ce3160404e56ad9c209fc92082193bf0ff21ae
parent567a9aa131d398adf11844d1611d062638f3871b (diff)
Fixing test deploy.
-rwxr-xr-xdocker/dev/dev_deploy.sh12
-rwxr-xr-xdocker/dev/test_deploy.sh11
2 files changed, 11 insertions, 12 deletions
diff --git a/docker/dev/dev_deploy.sh b/docker/dev/dev_deploy.sh
deleted file mode 100755
index ef41434b..00000000
--- a/docker/dev/dev_deploy.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-# Building from the dev branch for dev servers
-git checkout dev
-
-# Rebuilding dev docker
-docker-compose build
-docker tag dev_lemmy:latest dessalines/lemmy:dev
-docker push dessalines/lemmy:dev
-
-# SSH and pull it
-ssh $LEMMY_USER@$LEMMY_HOST "cd ~/git/lemmy/docker/dev && docker pull dessalines/lemmy:dev && docker-compose up -d"
diff --git a/docker/dev/test_deploy.sh b/docker/dev/test_deploy.sh
new file mode 100755
index 00000000..1ae91f65
--- /dev/null
+++ b/docker/dev/test_deploy.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# Rebuilding dev docker
+docker-compose build
+docker tag dev_lemmy:latest dessalines/lemmy:test
+docker push dessalines/lemmy:test
+
+# Run the playbook
+pushd ../../../lemmy-ansible
+ansible-playbook -i test playbooks/site.yml --vault-password-file vault_pass
+popd