diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index ba69e72..1b97360 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -35,11 +35,11 @@ jobs: - name: 'Checkout GitHub Action' uses: actions/checkout@main - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + # - name: Set up QEMU + # uses: docker/setup-qemu-action@v1 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + # - name: Set up Docker Buildx + # uses: docker/setup-buildx-action@v1 - name: 'Login to GitHub Container Registry' uses: docker/login-action@v1 @@ -67,6 +67,21 @@ jobs: --build-arg SHORT_COMMIT_ID=$SHORT_COMMIT_ID \ -f docker/Dockerfile \ --push . + + # - name: "Build, Tag, and push the Docker image" + # env: + # IMAGE_NAME: ghcr.io/manimatter/decluttarr + # IMAGE_TAG: dev + # run: | + # docker buildx build \ <<<<<<<<<<<<<<<<<<<<< creates manifest issues... don't know how to solve that + # --platform linux/amd64,linux/arm64 \ <<<<<<<<<<<<<<<<<<<<< creates manifest issues... don't know how to solve that + # -t $IMAGE_NAME:$IMAGE_TAG \ + # --label com.decluttarr.version=$IMAGE_TAG \ + # --label com.decluttarr.commit=$SHORT_COMMIT_ID \ + # --build-arg IMAGE_TAG=$IMAGE_TAG \ + # --build-arg SHORT_COMMIT_ID=$SHORT_COMMIT_ID \ + # -f docker/Dockerfile \ + # --push . - name: "Delete untagged versions" uses: actions/delete-package-versions@v4 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f2176b3..122f1c5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,11 +18,11 @@ jobs: - name: 'Checkout GitHub Action' uses: actions/checkout@main - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + # - name: Set up QEMU + # uses: docker/setup-qemu-action@v1 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + # - name: Set up Docker Buildx + # uses: docker/setup-buildx-action@v1 - name: 'Login to GitHub Container Registry' uses: docker/login-action@v1 @@ -53,8 +53,7 @@ jobs: IMAGE_NAME: ghcr.io/manimatter/decluttarr IMAGE_TAG: ${{ steps.setversion.outputs.new_tag }} run: | - docker buildx build \ - --platform linux/amd64,linux/arm64 \ + docker build \ -t $IMAGE_NAME:$IMAGE_TAG \ -t $IMAGE_NAME:latest \ --label com.decluttarr.version=$IMAGE_TAG \ @@ -64,3 +63,18 @@ jobs: -f docker/Dockerfile \ --push . + # - name: "Build, Tag, and push the Docker image" + # env: + # IMAGE_NAME: ghcr.io/manimatter/decluttarr + # IMAGE_TAG: ${{ steps.setversion.outputs.new_tag }} + # run: | + # docker buildx build \ <<<<<<<<<<<<<<<<<<<<< creates manifest issues... don't know how to solve that + # --platform linux/amd64,linux/arm64 \ <<<<<<<<<<<<<<<<<<<<< creates manifest issues... don't know how to solve that + # -t $IMAGE_NAME:$IMAGE_TAG \ + # -t $IMAGE_NAME:latest \ + # --label com.decluttarr.version=$IMAGE_TAG \ + # --label com.decluttarr.commit=$SHORT_COMMIT_ID \ + # --build-arg IMAGE_TAG=$IMAGE_TAG \ + # --build-arg SHORT_COMMIT_ID=$SHORT_COMMIT_ID \ + # -f docker/Dockerfile \ + # --push . \ No newline at end of file