gsathecat
/
lemmy
mirror of https://github.com/LemmyNet/lemmy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev'

pull/424/head
Dessalines 2020-01-14 17:14:06 -05:00
parent 6cd9156d3b 48e221d06c
commit f8525b2474
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,5 +1,6 @@
ansible/inventory ansible/inventory
ansible/passwords/ ansible/passwords/
docker/lemmy_mine.hjson docker/lemmy_mine.hjson
docker/dev/env_deploy.sh
build/ build/
.idea/ .idea/

2
docker/dev/dev_deploy.sh vendored
View File

@ -9,4 +9,4 @@ docker tag dev_lemmy:latest dessalines/lemmy:dev
docker push dessalines/lemmy:dev docker push dessalines/lemmy:dev
# SSH and pull it # SSH and pull it
ssh tyler@45.55.175.59 "cd ~/git/lemmy/docker/dev && docker pull dessalines/lemmy:dev && docker-compose up -d" ssh $LEMMY_USER@$LEMMY_HOST "cd ~/git/lemmy/docker/dev && docker pull dessalines/lemmy:dev && docker-compose up -d"