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

Merge branch 'prefix-docker-commands' into 'main'

Browse Source 
prefix all docker commands with docker-

See merge request services/common!7
This commit is contained in:
Reese
2021-12-13 00:26:23 +00:00
parent ba2827a8fe 91b77b3d31
commit 4bf9d45797
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -16,8 +16,6 @@ include .gitlab/make/git.makefile
include .gitlab/make/kubectl.makefile include .gitlab/make/kubectl.makefile
# git subtree add --prefix .gitlab --squash --message "Merge update from Common" -q git@gitlab.ducoterra.net:services/common.git main # git subtree add --prefix .gitlab --squash --message "Merge update from Common" -q git@gitlab.ducoterra.net:services/common.git main
# git reset head~1
.PHONY: make-update .PHONY: make-update
make-update: make-update:
@git subtree pull --prefix .gitlab --squash --message "Merge update from Common" -q git@gitlab.ducoterra.net:services/common.git $(MAKE_BRANCH) @git subtree pull --prefix .gitlab --squash --message "Merge update from Common" -q git@gitlab.ducoterra.net:services/common.git $(MAKE_BRANCH)
@git reset head~1

22
make/docker.makefile
View File

@@ -3,27 +3,27 @@ docker-init:
@touch VERSION @touch VERSION
@touch IMAGE @touch IMAGE
.PHONY: buildx-context .PHONY: docker-buildx-context
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: buildx-clear .PHONY: docker-buildx-clear
buildx-clear: docker-buildx-clear:
docker buildx rm container-builder docker buildx rm container-builder
.PHONY: build .PHONY: docker-build
build: docker-build:
docker buildx build --load . -t $(IMAGE) docker buildx build --load . -t $(IMAGE)
@docker buildx build --load . -t $(IMAGE_LATEST) @docker buildx build --load . -t $(IMAGE_LATEST)
.PHONY: push .PHONY: docker-push
push: docker-push:
-make buildx-clear -make docker-buildx-clear
@make 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 .PHONY: docker-release
docker-release: docker-release:
@yq e ".services.minecraft.image = \"$(IMAGE)\"" -i docker-compose.yaml @yq e ".services.minecraft.image = \"$(IMAGE)\"" -i docker-compose.yaml
@make push @make docker-push