From 50667e9787eb0e95fd7baedfd02c5bf57a28d619 Mon Sep 17 00:00:00 2001 From: RaphiMC <50594595+RaphiMC@users.noreply.github.com> Date: Sat, 29 Jun 2024 15:14:22 +0200 Subject: [PATCH] Improved build-docker.yml --- .github/workflows/build-docker.yml | 7 ++++--- Dockerfile | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index 1e184e7..de91ed2 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -38,15 +38,16 @@ jobs: with: tags: | type=raw,value=latest - type=sha + type=raw,value=${{ github.ref_name }} + type=semver,pattern={{version}} images: ${{ env.REGISTRY }}/${{ github.repository }} - name: Build and push Docker image - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . push: true + provenance: false tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - platforms: linux/amd64,linux/arm64 cache-from: type=gha cache-to: type=gha,mode=max diff --git a/Dockerfile b/Dockerfile index 83bbf03..ce2f2a1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$TARGETPLATFORM eclipse-temurin:21-jre-alpine +FROM eclipse-temurin:21-jre-alpine WORKDIR /app/run COPY /build/libs/ViaProxy-*.jar /app/ViaProxy.jar ENTRYPOINT ["java", "-jar", "/app/ViaProxy.jar", "config", "viaproxy.yml"]