From 88716ad3ffe200cdfa80021a8143314292c7530d Mon Sep 17 00:00:00 2001 From: ducoterra Date: Mon, 13 Dec 2021 15:05:52 -0500 Subject: [PATCH 1/2] populate default values for VERSION and IMAGE file when docker-init is run --- make/docker.makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make/docker.makefile b/make/docker.makefile index 08fa671..addc87a 100644 --- a/make/docker.makefile +++ b/make/docker.makefile @@ -1,7 +1,7 @@ .PHONY: docker-init docker-init: - @touch VERSION - @touch IMAGE + @echo "0.0.1" >> VERSION + @echo "$(PROJECT_NAME)" >> IMAGE .PHONY: docker-buildx-context docker-buildx-context: From f6aed2c86a0696c7cd40d96278bf1f236952e23d Mon Sep 17 00:00:00 2001 From: ducoterra Date: Mon, 13 Dec 2021 15:06:19 -0500 Subject: [PATCH 2/2] add docker-compose init, up, and down targets --- make/docker.makefile | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/make/docker.makefile b/make/docker.makefile index addc87a..f5151b7 100644 --- a/make/docker.makefile +++ b/make/docker.makefile @@ -21,3 +21,17 @@ docker-push: @make docker-buildx-context docker buildx build --platform linux/amd64,linux/arm64 --push . -t $(IMAGE) @docker buildx build --platform linux/amd64,linux/arm64 --push . -t $(IMAGE_LATEST) + +.PHONY: docker-compose-init +docker-compose-init: + @touch docker-compose.yaml + @yq e ".version = \"3\"" -i docker-compose.yaml + @yq e ".services.main.image = \"$(IMAGE)\"" -i docker-compose.yaml + +.PHONY: docker-compose-up +docker-compose-up: + docker-compose up -d + +.PHONY: docker-compose-down +docker-compose-down: + docker-compose down