Improve workflow

antlafarge · Jun 27, 2024 · c4757e9 · c4757e9
1 parent 527054e
commit c4757e9
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 24 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,12 +1,21 @@
 name: Dockerhub-build
 
+env:
+  IMAGE_NAME: antlafarge/jdownloader
+
 on:
   push:
     branches:
       - 'main'
     paths-ignore:
       - '**.md'
       - '**.MD'
+  pull_request:
+    branches:
+      - 'main'
+    paths-ignore:
+      - '**.md'
+      - '**.MD'
   workflow_dispatch:
   schedule:
     - cron: '0 0 1 * *'
@@ -36,45 +45,45 @@ jobs:
         with:
           file: alpine-openjdk8.Dockerfile
           platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x
-          tags: antlafarge/jdownloader:dev-alpine-openjdk8
+          tags: ${{ env.IMAGE_NAME }}:dev-alpine-openjdk8
           push: true
       -
         name: dev-ubuntu-openjdk8
         uses: docker/build-push-action@v6
         with:
           file: ubuntu-openjdk8.Dockerfile
           platforms: linux/amd64,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x
-          tags: antlafarge/jdownloader:dev-ubuntu-openjdk8
+          tags: ${{ env.IMAGE_NAME }}:dev-ubuntu-openjdk8
           push: true
       -
         name: dev-alpine-openjdk17
         uses: docker/build-push-action@v6
         with:
           file: alpine-openjdk17.Dockerfile
           platforms: linux/amd64,linux/arm64/v8,linux/ppc64le,linux/s390x
-          tags: antlafarge/jdownloader:dev-alpine-openjdk17
+          tags: ${{ env.IMAGE_NAME }}:dev-alpine-openjdk17
           push: true
       -
         name: dev-ubuntu-openjdk17
         uses: docker/build-push-action@v6
         with:
           file: ubuntu-openjdk17.Dockerfile
           platforms: linux/amd64,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x
-          tags: antlafarge/jdownloader:dev-ubuntu-openjdk17
+          tags: ${{ env.IMAGE_NAME }}:dev-ubuntu-openjdk17
           push: true
       -
         name: dev-alpine-openjdk21
         uses: docker/build-push-action@v6
         with:
           file: alpine-openjdk21.Dockerfile
           platforms: linux/amd64,linux/arm64/v8,linux/ppc64le,linux/riscv64,linux/s390x
-          tags: antlafarge/jdownloader:dev-alpine-openjdk21
+          tags: ${{ env.IMAGE_NAME }}:dev-alpine-openjdk21
           push: true
       -
         name: dev-ubuntu-openjdk21
         uses: docker/build-push-action@v6
         with:
           file: ubuntu-openjdk21.Dockerfile
           platforms: linux/amd64,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x
-          tags: antlafarge/jdownloader:dev-ubuntu-openjdk21
+          tags: ${{ env.IMAGE_NAME }}:dev-ubuntu-openjdk21
           push: true
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,5 +1,8 @@
 name: Dockerhub-release
 
+env:
+  IMAGE_NAME: antlafarge/jdownloader
+
 on:
   workflow_dispatch:
 
@@ -25,42 +28,42 @@ jobs:
       -
         name: alpine-openjdk8
         run: |
-          docker pull antlafarge/jdownloader:dev-alpine-openjdk8
-          docker buildx imagetools create antlafarge/jdownloader:dev-alpine-openjdk8 -t antlafarge/jdownloader:alpine-openjdk8
+          docker pull ${{ env.IMAGE_NAME }}:dev-alpine-openjdk8
+          docker buildx imagetools create ${{ env.IMAGE_NAME }}:dev-alpine-openjdk8 -t ${{ env.IMAGE_NAME }}:alpine-openjdk8
       -
         name: ubuntu-openjdk8, openjdk8
         run: |
-          docker pull antlafarge/jdownloader:dev-ubuntu-openjdk8
-          docker buildx imagetools create antlafarge/jdownloader:dev-ubuntu-openjdk8 -t antlafarge/jdownloader:ubuntu-openjdk8
-          docker buildx imagetools create antlafarge/jdownloader:dev-ubuntu-openjdk8 -t antlafarge/jdownloader:openjdk8
+          docker pull ${{ env.IMAGE_NAME }}:dev-ubuntu-openjdk8
+          docker buildx imagetools create ${{ env.IMAGE_NAME }}:dev-ubuntu-openjdk8 -t ${{ env.IMAGE_NAME }}:ubuntu-openjdk8
+          docker buildx imagetools create ${{ env.IMAGE_NAME }}:dev-ubuntu-openjdk8 -t ${{ env.IMAGE_NAME }}:openjdk8
       -
         name: alpine-openjdk17
         run: |
-          docker pull antlafarge/jdownloader:dev-alpine-openjdk17
-          docker buildx imagetools create antlafarge/jdownloader:dev-alpine-openjdk17 -t antlafarge/jdownloader:alpine-openjdk17
+          docker pull ${{ env.IMAGE_NAME }}:dev-alpine-openjdk17
+          docker buildx imagetools create ${{ env.IMAGE_NAME }}:dev-alpine-openjdk17 -t ${{ env.IMAGE_NAME }}:alpine-openjdk17
       -
         name: ubuntu-openjdk17, openjdk17
         run: |
-          docker pull antlafarge/jdownloader:dev-ubuntu-openjdk17
-          docker buildx imagetools create antlafarge/jdownloader:dev-ubuntu-openjdk17 -t antlafarge/jdownloader:ubuntu-openjdk17
-          docker buildx imagetools create antlafarge/jdownloader:dev-ubuntu-openjdk17 -t antlafarge/jdownloader:openjdk17
+          docker pull ${{ env.IMAGE_NAME }}:dev-ubuntu-openjdk17
+          docker buildx imagetools create ${{ env.IMAGE_NAME }}:dev-ubuntu-openjdk17 -t ${{ env.IMAGE_NAME }}:ubuntu-openjdk17
+          docker buildx imagetools create ${{ env.IMAGE_NAME }}:dev-ubuntu-openjdk17 -t ${{ env.IMAGE_NAME }}:openjdk17
       -
         name: alpine-openjdk21
         run: |
-          docker pull antlafarge/jdownloader:dev-alpine-openjdk21
-          docker buildx imagetools create antlafarge/jdownloader:dev-alpine-openjdk21 -t antlafarge/jdownloader:alpine-openjdk21
+          docker pull ${{ env.IMAGE_NAME }}:dev-alpine-openjdk21
+          docker buildx imagetools create ${{ env.IMAGE_NAME }}:dev-alpine-openjdk21 -t ${{ env.IMAGE_NAME }}:alpine-openjdk21
       -
         name: ubuntu-openjdk21, openjdk21
         run: |
-          docker pull antlafarge/jdownloader:dev-ubuntu-openjdk21
-          docker buildx imagetools create antlafarge/jdownloader:dev-ubuntu-openjdk21 -t antlafarge/jdownloader:ubuntu-openjdk21
-          docker buildx imagetools create antlafarge/jdownloader:dev-ubuntu-openjdk21 -t antlafarge/jdownloader:openjdk21
+          docker pull ${{ env.IMAGE_NAME }}:dev-ubuntu-openjdk21
+          docker buildx imagetools create ${{ env.IMAGE_NAME }}:dev-ubuntu-openjdk21 -t ${{ env.IMAGE_NAME }}:ubuntu-openjdk21
+          docker buildx imagetools create ${{ env.IMAGE_NAME }}:dev-ubuntu-openjdk21 -t ${{ env.IMAGE_NAME }}:openjdk21
       -
         name: ubuntu, alpine and latest
         run: |
-          docker buildx imagetools create antlafarge/jdownloader:dev-alpine-openjdk21 -t antlafarge/jdownloader:alpine
-          docker buildx imagetools create antlafarge/jdownloader:dev-ubuntu-openjdk21 -t antlafarge/jdownloader:ubuntu
-          docker buildx imagetools create antlafarge/jdownloader:dev-ubuntu-openjdk21 -t antlafarge/jdownloader:latest
+          docker buildx imagetools create ${{ env.IMAGE_NAME }}:dev-alpine-openjdk21 -t ${{ env.IMAGE_NAME }}:alpine
+          docker buildx imagetools create ${{ env.IMAGE_NAME }}:dev-ubuntu-openjdk21 -t ${{ env.IMAGE_NAME }}:ubuntu
+          docker buildx imagetools create ${{ env.IMAGE_NAME }}:dev-ubuntu-openjdk21 -t ${{ env.IMAGE_NAME }}:latest
       -
         name: Logout from Docker Hub
         run: docker logout