aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/ci.yml11
-rw-r--r--Makefile18
-rw-r--r--README.md8
3 files changed, 3 insertions, 34 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 74114b9..3ffed23 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,15 +6,6 @@ on:
workflow_dispatch:
jobs:
- docker:
- runs-on: ubuntu-latest
- name: Build / docker build
- steps:
- - name: Checkout
- uses: actions/checkout@v3
- - name: Build /w docker build
- run: make docker/build
-
compose:
runs-on: ubuntu-latest
name: Build / docker-compose
@@ -37,7 +28,7 @@ jobs:
make buildx/rm
publish:
- needs: [docker, compose, buildx]
+ needs: [compose, buildx]
strategy:
matrix:
project: [dump1090, fr24feed]
diff --git a/Makefile b/Makefile
index cdafbf6..5b9e281 100644
--- a/Makefile
+++ b/Makefile
@@ -81,24 +81,6 @@ ifndef FORCE
$(error Please use `docker buildx build --push` instead)
endif
-# `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/%: DO check-build
- docker build -t '$(call escape,$(DOCKER_USERNAME))/$*' '$*/'
-
-.PHONY: docker/build
-docker/build: docker/build/dump1090 docker/build/fr24feed
-
-# `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/%: DO check-push docker/build/%
- docker push '$(call escape,$(DOCKER_USERNAME))/$*'
-
-.PHONY: docker/push
-docker/push: check-push docker/push/dump1090 docker/push/fr24feed
-
.PHONY: compose/build
# `docker-compose build` has the same problems as `docker build`.
compose/build: check-build
diff --git a/README.md b/README.md
index b09f217..fd8f2d2 100644
--- a/README.md
+++ b/README.md
@@ -63,13 +63,9 @@ in dump1090 container output if your dongle isn't supported.
Development
-----------
-TL;DR: build the native images using
+TL;DR: build Docker images using
- make compose/build
-
-Or, if you have Compose version 1.24.x or below,
-
- make docker/build
+ make
### Dependencies