aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/Makefile
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2023-02-08 12:10:57 +0100
committerEgor Tensin <Egor.Tensin@gmail.com>2023-02-08 12:11:00 +0100
commitd7d84a667a30fbfd2a095ee4a691de9dae91e795 (patch)
treecd6417d47ed7e399ff1bf8c1bf45658217148173 /Makefile
parentMakefile: fix make */build recipes (diff)
downloadcgitize-d7d84a667a30fbfd2a095ee4a691de9dae91e795.tar.gz
cgitize-d7d84a667a30fbfd2a095ee4a691de9dae91e795.zip
Makefile: use docker-compose for make build
First, it would actually build both images: cgitize and cgitize-frontend. Second, it's already tested in t/i/docker.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile28
1 files changed, 14 insertions, 14 deletions
diff --git a/Makefile b/Makefile
index 0344357..c994fd3 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ endif
.PHONY: build
# Build natively by default.
-build: docker/build
+build: compose/build
.PHONY: clean
clean:
@@ -67,19 +67,19 @@ ifndef FORCE
$(error Please use `docker buildx build --push` instead)
endif
-.PHONY: docker/build
-# `docker 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.
-docker/build: check-build
- docker build -t '$(call escape,$(DOCKER_USERNAME))/$(call escape,$(PROJECT))' -f docker/Dockerfile .
-
-.PHONY: docker/push
-# `docker 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.
-docker/push: check-push docker/build
- docker push '$(call escape,$(DOCKER_USERNAME))/$(call escape,$(PROJECT))'
+.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
+
+.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: