From 1e86711eb3853a9066cb72fc29a0995303360a0c Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Thu, 19 Dec 2024 11:19:08 +0100 Subject: Makefile: remove docker-compose shortcuts They don't work on GitHub Actions runners anymore, and they were kinda trivial anyway. --- Makefile | 46 +--------------------------------------------- 1 file changed, 1 insertion(+), 45 deletions(-) diff --git a/Makefile b/Makefile index 89dff72..8a5ecf1 100644 --- a/Makefile +++ b/Makefile @@ -27,55 +27,11 @@ endif | docker login --username '$(call escape,$(DOCKER_USERNAME))' --password-stdin .PHONY: build -# Build natively by default. -build: compose/build - -.PHONY: clean -clean: - docker system prune --all --force --volumes +build: buildx/build .PHONY: push -# Push multi-arch images by default. push: buildx/push -.PHONY: pull -pull: - docker-compose pull - -.PHONY: up -up: - docker-compose up -d - -.PHONY: down -down: - docker-compose down --volumes - -.PHONY: check-build -check-build: -ifndef FORCE - $(warning Going to build natively; consider `docker buildx build` instead) -endif - -.PHONY: check-push -check-push: -ifndef FORCE - $(error Please use `docker buildx build --push` instead) -endif - -.PHONY: compose/build -# `docker-compose build` has week support for multiarch repos (you need to use -# multiple Dockerfile's, create a manifest manually, etc.), so it's only here -# for testing purposes, and native builds. -compose/build: check-build - docker-compose build --progress plain - -.PHONY: compose/push -# `docker-compose push` would replace the multiarch repo with a single image by -# default (you'd have to create a manifest and push it instead), so it's only -# here for testing purposes. -compose/push: check-push compose/build - docker-compose push - .PHONY: buildx/create buildx/create: docker buildx create --use --name '$(call escape,$(PROJECT))_builder' -- cgit v1.2.3