From 098a69c0472cafba7b51e167d225f5ebb66d0ab4 Mon Sep 17 00:00:00 2001 From: Nulo Date: Sat, 18 Sep 2021 11:13:44 -0300 Subject: [PATCH] Makefile: especificar root en ssh --- Makefile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 06c7214..c6151f3 100644 --- a/Makefile +++ b/Makefile @@ -102,20 +102,20 @@ save: ## Subir la imagen Docker al nodo delegado @echo -e "\a" ota-js: assets ## Actualizar Javascript en el nodo delegado - rsync -avi --chown=:82 --delete-after public/ $(delegate):/srv/sutty/srv/http/data/_$(public)/ - rsync -avi --chown=:82 --delete-after public/ $(delegate):/srv/sutty/srv/http/data/_public/_staging/ - ssh $(delegate) docker exec $(container) sh -c "cat /srv/http/tmp/puma.pid | xargs -r kill -USR2" + rsync -avi --chown=:82 --delete-after public/ root@$(delegate):/srv/sutty/srv/http/data/_$(public)/ + rsync -avi --chown=:82 --delete-after public/ root@$(delegate):/srv/sutty/srv/http/data/_public/_staging/ + ssh root@$(delegate) docker exec $(container) sh -c "cat /srv/http/tmp/puma.pid | xargs -r kill -USR2" ota: ## Actualizar Rails en el nodo delegado umask 022; git format-patch $(commit) - scp ./0*.patch $(delegate):/tmp/ - ssh $(delegate) mkdir -p /tmp/patches-$(commit)/ - scp ./0*.patch $(delegate):/tmp/patches-$(commit)/ - scp ./ota.sh $(delegate):/tmp/ - ssh $(delegate) docker cp /tmp/patches-$(shell echo $(commit) | cut -d / -f 1) $(container):/tmp/ - ssh $(delegate) docker cp /tmp/ota.sh $(container):/usr/local/bin/ota - ssh $(delegate) docker exec $(container) apk add --no-cache patch - ssh $(delegate) docker exec $(container) ota $(commit) + scp ./0*.patch root@$(delegate):/tmp/ + ssh root@$(delegate) mkdir -p /tmp/patches-$(commit)/ + scp ./0*.patch root@$(delegate):/tmp/patches-$(commit)/ + scp ./ota.sh root@$(delegate):/tmp/ + ssh root@$(delegate) docker cp /tmp/patches-$(shell echo $(commit) | cut -d / -f 1) $(container):/tmp/ + ssh root@$(delegate) docker cp /tmp/ota.sh $(container):/usr/local/bin/ota + ssh root@$(delegate) docker exec $(container) apk add --no-cache patch + ssh root@$(delegate) docker exec $(container) ota $(commit) rm ./0*.patch # Todos los archivos de assets. Si alguno cambia, se van a recompilar