From 66875efa73c9fd5baba2f914fe60f32d11db053e Mon Sep 17 00:00:00 2001 From: f Date: Sat, 9 Jan 2021 14:25:41 -0300 Subject: [PATCH] entorno de trabajo --- Makefile | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 69bb123..d390b7e 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,8 @@ public/packs/manifest.json: $(assets) assets: public/packs/manifest.json -serve: - bundle exec rails s -b "ssl://0.0.0.0:3000?key=../sutty.local/domain/sutty.local.key&cert=../sutty.local/domain/sutty.local.crt" +serve: /etc/hosts + bundle exec rails s -b "ssl://0.0.0.0:3000?key=../sutty.local/domain/$(SUTTY).key&cert=../sutty.local/domain/$(SUTTY).crt" # Limpiar los archivos de testeo clean: @@ -73,15 +73,10 @@ dirs := $(patsubst %,root/%,data sites deploy public) $(dirs): mkdir -p $@ -test-container: $(dirs) - docker run -v $(PWD)/root/data:/srv/http/data \ - -v $(PWD)/root/sites:/srv/http/_sites \ - -v $(PWD)/root/deploy:/srv/http/_deploy \ - -v $(PWD)/root/public:/srv/http/_public \ - -v $(PWD)/config/credentials.yml.enc:/srv/http/config/credentials.yml.enc \ - -e RAILS_MASTER_KEY=`cat config/master.key` \ - -e RAILS_ENV=production \ - -it \ - --rm \ - --name=sutty \ - sutty/sutty /bin/sh +/etc/hosts: always + @echo "Chequeando si es necesario agregar el dominio local $(SUTTY)" + @grep -q " $(SUTTY)$$" $@ || echo -e "127.0.0.1 $(SUTTY)\n::1 $(SUTTY)" | sudo tee -a $@ + @grep -q " api.$(SUTTY)$$" $@ || echo -e "127.0.0.1 api.$(SUTTY)\n::1 $(SUTTY)" | sudo tee -a $@ + @grep -q " panel.$(SUTTY)$$" $@ || echo -e "127.0.0.1 panel.$(SUTTY)\n::1 $(SUTTY)" | sudo tee -a $@ + +.PHONY: always