diff --git a/.dockerignore b/.dockerignore index 68ab989..296a2a5 100644 --- a/.dockerignore +++ b/.dockerignore @@ -4,4 +4,3 @@ Dockerfile LICENSE README.md -k8s/ diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5ef7f70..3d90bd2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,18 +46,7 @@ jobs: username: ${{ secrets.GHCR_USERNAME }} password: ${{ secrets.GHCR_TOKEN }} - - name: Build and Push (PR) - if: github.event_name == 'pull_request' - uses: docker/build-push-action@v2 - with: - context: . - file: ./Dockerfile - platforms: linux/amd64,linux/arm/v7,linux/arm64 - push: false # GitHub secrets not available in PRs - tags: | - ghcr.io/${{ github.repository_owner }}/pull-request:${{github.event.number}} - - - name: Build and Push (master branch) + - name: Build and Push if: github.event_name != 'pull_request' uses: docker/build-push-action@v2 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c10a11b..cd1f548 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,7 +42,7 @@ jobs: username: ${{ secrets.GHCR_USERNAME }} password: ${{ secrets.GHCR_TOKEN }} - - name: Build and Push (release) + - name: Build and Push if: github.event_name != 'pull_request' uses: docker/build-push-action@v2 with: diff --git a/Dockerfile b/Dockerfile index 23928b9..e2cfdb9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ RUN \ && \ chmod +x exportarr -FROM apline:3.13 +FROM alpine:3.13 ENV PORT="9707" RUN \