diff options
| -rw-r--r-- | .github/workflows/ci.yml | 24 | ||||
| -rw-r--r-- | Makefile | 28 |
2 files changed, 15 insertions, 37 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 77ad7df..7f379d3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,29 +36,7 @@ jobs: - name: Unit tests run: python -m unittest --buffer - build_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 - - build_buildx: - runs-on: ubuntu-latest - name: 'Build / docker buildx' - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Build w/ docker buildx - run: | - make buildx/create - make buildx/build - make buildx/rm - test_docker: - needs: [test_local, build_docker, build_buildx] runs-on: ubuntu-latest name: 'Test / Docker' steps: @@ -68,7 +46,7 @@ jobs: run: sudo ./test/integration/docker/test.sh test_example_config: - needs: [test_local, build_docker, build_buildx] + needs: [test_local, test_docker] runs-on: ubuntu-latest name: 'Test / example config' env: @@ -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: |