aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2021-01-24 15:11:44 +0100
committerMartin Polden <mpolden@mpolden.no>2021-01-24 15:11:44 +0100
commit4024add6e11c7739ae483bf1637c39777a049345 (patch)
treee61062b75e947d50eedda0493f664ef4ff31a1be
parent8374778df8462851acfd1a03159b50b060a5fb81 (diff)
build: Build and publish image once
-rw-r--r--.github/workflows/ci.yml4
-rw-r--r--Makefile2
2 files changed, 1 insertions, 5 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a1e75cb..156bdee 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,9 +24,5 @@ jobs:
run: |
echo '{"experimental":true}' | sudo tee /etc/docker/daemon.json
sudo service docker restart
- - name: build docker image
- run: make docker-build
- - name: publish docker image
- run: make docker-push
- name: publish multi-arch docker image
run: make docker-pushx
diff --git a/Makefile b/Makefile
index 6b1cfd9..8d07bac 100644
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,7 @@ docker-test:
docker-push: docker-test docker-login
$(DOCKER) push $(DOCKER_IMAGE)
-docker-pushx: docker-multiarch-builder docker-login
+docker-pushx: docker-multiarch-builder docker-test docker-login
$(DOCKER) buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t $(DOCKER_IMAGE) --push .
xinstall: