Squashed '.gitlab/' changes from 9eed509..731ada6
731ada6Merge branch 'make-update-fixes' into 'main'c3e6d73Switch to "subtree split" push strategy3c91292Make user stash their own damn changesd86b505Add PROJECT_NAME and VERSION9d0c9c6Update README with "common" remote30fb8c2Merge branch 'docker-buidlx-overhaul' into 'main'fd96b3fMerge branch 'git-release' into 'main'a6053edAdd make git-release3563c5cAdd make docker-release40a217bUse buildx to create multi-arch images5e2bc5fSwitch to container-builder buildx platform git-subtree-dir: .gitlab git-subtree-split:731ada6a3d
This commit is contained in:
@@ -5,18 +5,25 @@ docker-init:
|
||||
|
||||
.PHONY: buildx-context
|
||||
buildx-context:
|
||||
docker buildx create --name arm64 --use --platform linux/amd64,linux/arm64
|
||||
docker buildx create --name container-builder --use --platform linux/amd64,linux/arm64
|
||||
|
||||
.PHONY: buildx-clear
|
||||
buildx-clear:
|
||||
docker buildx rm arm64
|
||||
docker buildx rm container-builder
|
||||
|
||||
.PHONY: build
|
||||
build:
|
||||
docker buildx build --load . -t $(IMAGE)
|
||||
@docker buildx build --load . -t $(IMAGE_LATEST)
|
||||
@docker buildx build --load . -t $(IMAGE_LATEST)
|
||||
|
||||
.PHONY: push
|
||||
push:
|
||||
docker buildx build --platform linux/amd64 --push . -t $(IMAGE)
|
||||
@docker buildx build --platform linux/amd64 --push . -t $(IMAGE_LATEST)
|
||||
-make buildx-clear
|
||||
@make 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-release
|
||||
docker-release:
|
||||
@yq e ".services.minecraft.image = \"$(IMAGE)\"" -i docker-compose.yaml
|
||||
@make push
|
||||
|
||||
5
make/git.makefile
Normal file
5
make/git.makefile
Normal file
@@ -0,0 +1,5 @@
|
||||
.PHONY: git-release
|
||||
git-release:
|
||||
@git add .
|
||||
@git commit -m "Automated release for version $(VERSION)"
|
||||
@git tag $(VERSION)
|
||||
Reference in New Issue
Block a user