yogsototh/espial
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

update to docker compose v2

Browse source
This commit is contained in:
Jon Schoning 2022-04-30 19:55:45 -05:00 committed by Yann Esposito (Yogsototh)
parent 62881e3a58
commit 2402fde5c3
Signed by untrusted user who does not match committer: yogsototh
GPG key ID: 7B19A4C650D59646
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Makefile
View file

@ -1,3 +1,6 @@
_DOCKER:=docker
_DOCKER_COMPOSE:=docker compose
.PHONY: clean build .PHONY: clean build
all: build all: build
@ -26,7 +29,7 @@ migrate-createdb:
serve: serve:
@stack exec espial -- +RTS -T @stack exec espial -- +RTS -T
_ESPIAL_PS_ID = $$(docker-compose ps -q espial) _ESPIAL_PS_ID = $$($(_DOCKER_COMPOSE) ps -q espial)
_LOCAL_INSTALL_PATH = $$(stack path | grep local-install-root | awk -e '{print $$2}') _LOCAL_INSTALL_PATH = $$(stack path | grep local-install-root | awk -e '{print $$2}')
_EKG_ASSETS_PATH = $$(find ~/.stack -type d | grep ekg.*assets) _EKG_ASSETS_PATH = $$(find ~/.stack -type d | grep ekg.*assets)
@ -38,20 +41,20 @@ docker-compose-build: build
@cp -R config dist @cp -R config dist
@mkdir -p dist/ekg/assets @mkdir -p dist/ekg/assets
@cp -R $(_EKG_ASSETS_PATH) dist/ekg @cp -R $(_EKG_ASSETS_PATH) dist/ekg
@docker-compose build espial @$(_DOCKER_COMPOSE) build espial
docker-compose-up: docker-compose-up:
@docker-compose up --no-deps --no-build espial @$(_DOCKER_COMPOSE) up --no-deps --no-build espial
docker-compose-down: docker-compose-down:
@docker-compose down @$(_DOCKER_COMPOSE) down
docker-compose-up-d: docker-compose-up-d:
@docker-compose up --no-deps --no-build -d espial @$(_DOCKER_COMPOSE) up --no-deps --no-build -d espial
docker-compose-pull: docker-compose-pull:
@docker-compose pull espial @$(_DOCKER_COMPOSE) pull espial
docker-compose-push: docker-compose-push:
@docker tag localhost/espial:espial $(HUB_REPO)/espial:espial @docker tag localhost/espial:espial $(HUB_REPO)/espial:espial
@docker-compose push espial @$(_DOCKER_COMPOSE) push espial
docker-espial-logs: docker-espial-logs:
@docker logs -f --since `date -u +%FT%TZ` $(_ESPIAL_PS_ID) @$(_DOCKER) logs -f --since `date -u +%FT%TZ` $(_ESPIAL_PS_ID)
docker-espial-shell: docker-espial-shell:
@$(docker_espial) sh @$(docker_espial) sh
@ -61,7 +64,7 @@ ifeq ($(_HUB_REPO),)
_HUB_REPO := "localhost" _HUB_REPO := "localhost"
endif endif
docker_espial = docker-compose exec espial docker_espial = $(_DOCKER_COMPOSE) exec espial
clean: clean:
@stack clean @stack clean