services/Common
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'various-docker-fixes' into 'main'

Browse Source 
fix docker build and remove release

See merge request services/common!9
This commit is contained in:
Reese
2021-12-13 00:33:44 +00:00
parent 4bf9d45797 5b3e196267
commit 16ee2f3ddc
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
make/docker.makefile
View File

@@ -5,16 +5,15 @@ docker-init:
.PHONY: docker-buildx-context .PHONY: docker-buildx-context
docker-buildx-context: docker-buildx-context:
docker buildx create --name container-builder --use --platform linux/amd64,linux/arm64 @docker buildx create --name container-builder --use --platform linux/amd64,linux/arm64
.PHONY: docker-buildx-clear .PHONY: docker-buildx-clear
docker-buildx-clear: docker-buildx-clear:
docker buildx rm container-builder @docker buildx rm container-builder
.PHONY: docker-build .PHONY: docker-build
docker-build: docker-build:
docker buildx build --load . -t $(IMAGE) docker build . -t $(IMAGE)
@docker buildx build --load . -t $(IMAGE_LATEST)
.PHONY: docker-push .PHONY: docker-push
docker-push: docker-push:
@@ -22,8 +21,3 @@ docker-push:
@make docker-buildx-context @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)
@docker buildx build --platform linux/amd64,linux/arm64 --push . -t $(IMAGE_LATEST) @docker buildx build --platform linux/amd64,linux/arm64 --push . -t $(IMAGE_LATEST)
.PHONY: docker-release
docker-release:
@yq e ".services.minecraft.image = \"$(IMAGE)\"" -i docker-compose.yaml
@make docker-push