From 2dd9cb924320b082e38dea775bb2c9047eb8149c Mon Sep 17 00:00:00 2001 From: Marcel van der Veldt Date: Sat, 13 Feb 2021 22:03:13 +0100 Subject: [PATCH] fix dockerfiles --- .github/workflows/docker-build alpine.yml | 76 ----------------------- .github/workflows/docker-build.yml | 2 +- 2 files changed, 1 insertion(+), 77 deletions(-) delete mode 100644 .github/workflows/docker-build alpine.yml diff --git a/.github/workflows/docker-build alpine.yml b/.github/workflows/docker-build alpine.yml deleted file mode 100644 index 8df67dd5..00000000 --- a/.github/workflows/docker-build alpine.yml +++ /dev/null @@ -1,76 +0,0 @@ -name: Build multiarch Docker image (Alpine based) - -on: - push: - release: - types: [published, prereleased] - workflow_dispatch: - inputs: - logLevel: - description: 'Log level' - required: true - default: 'warning' - tag: - description: 'Tag to set on docker image (e.g. 0.0.1' - required: true - -jobs: - buildx: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Prepare - id: prep - run: | - DOCKER_IMAGE=musicassistant/music-assistant - VERSION=latest - SHORTREF=${GITHUB_SHA::8} - MANUAL_TAG=${{ github.event.inputs.tag }} - - # If a manual tag was supplied, use that - if [[ -n $MANUAL_TAG ]]; then - VERSION=${MANUAL_TAG} - - # If this is git tag, use the tag name as a docker tag - elif [[ $GITHUB_REF == refs/tags/* ]]; then - VERSION=${GITHUB_REF#refs/tags/} - fi - TAGS="${DOCKER_IMAGE}:${VERSION},${DOCKER_IMAGE}:${SHORTREF}" - - # If the VERSION looks like a version number, assume that - # this is the most recent version of the image and also - # tag it 'latest'. - if [[ $VERSION =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then - TAGS="$TAGS,${DOCKER_IMAGE}:latest" - fi - - # Set output parameters. - echo ::set-output name=tags::${TAGS} - echo ::set-output name=docker_image::${DOCKER_IMAGE} - - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - with: - platforms: all - - - name: Set up Docker Buildx - id: buildx - uses: docker/setup-buildx-action@v1 - - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build - uses: docker/build-push-action@v2 - with: - builder: ${{ steps.buildx.outputs.name }} - context: . - file: ./Dockerfile.alpine - platforms: linux/amd64,linux/arm/v7,linux/arm64 - push: true - tags: ${{ steps.prep.outputs.tags }} diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 5d5300e2..f35a6250 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -1,4 +1,4 @@ -name: Build multiarch Docker image (Debian based) +name: Build multiarch Docker image on: push: -- 2.34.1