mirrors/bonfire-app
1
0
Fork 0
mirror of https://github.com/bonfire-networks/bonfire-app.git synced 2024-05-15 15:42:39 +00:00
Code Issues Projects Releases Wiki Activity

fix

Browse source
This commit is contained in:
Mayel de Borniol 2022-01-17 22:27:11 +13:00
parent fea9a16811
commit 818708826f
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -150,6 +150,9 @@ update.app: update.repo ## Update the app and Bonfire extensions in ./deps
update.repo:
@chmod +x git-publish.sh && ./git-publish.sh . pull
update.repo.pull:
@chmod +x git-publish.sh && ./git-publish.sh . pull only
update.deps.bonfire: init mix.remote~bonfire.deps ## Update to the latest Bonfire extensions in ./deps
update.deps.all: ## Update evey single dependency (use with caution)
@ -362,7 +365,7 @@ rel.run.bg: rel.env init docker.stop.web ## Run the app in Docker, and keep runn
rel.stop: rel.env ## Stop the running release
@docker-compose -p $(APP_REL_CONTAINER) -f $(APP_REL_DOCKERCOMPOSE) stop
rel.update: rel.env update.repo
rel.update: rel.env update.repo.pull
@docker-compose -p $(APP_REL_CONTAINER) -f $(APP_REL_DOCKERCOMPOSE) pull
@echo Remember to run migrations on your DB...

2
git-publish.sh
View file

@ -33,7 +33,7 @@ then
# git rebase origin
git pull --rebase && echo "Publishing changes!" || fail "Please resolve conflicts before continuing."
if [[ $2 != 'pull' && $2 == 'maybe-pull' ]]
if [[ $3 != 'only' ]]
then
git push
fi