chore: update jdk17_ffmpeg_nvidia

jamebal · Jun 7, 2024 · bc1675a · bc1675a
1 parent d47a775
commit bc1675a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 20 deletions.
diff --git a/.github/workflows/build_jdk_ffmpeg.yml b/.github/workflows/build_jdk_ffmpeg.yml
@@ -1,4 +1,4 @@
-name: Build jdk17_ffmpeg_nvidia
+name: Build jdk17_ffmpeg_nvidia Docker Image
 
 on:
   workflow_dispatch:
@@ -11,21 +11,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-      - name: Set up JDK 17 and Maven 3.8.4
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'zulu'
-          java-version: '17'
-          maven-version: '3.8.4'
-
-      - name: Build with Maven
-        run: mvn clean package -DskipTests
-
-      - name: Extract project version from pom.xml
-        run: |
-          VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
-          echo "PROJECT_VERSION=$VERSION" >> $GITHUB_ENV    
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
 
@@ -35,13 +20,22 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ secrets.GHCR_IO_USERNAME }}
+          password: ${{ secrets.GHCR_IO_TOKEN }}
+
       - name: Build and push Docker image
         uses: docker/build-push-action@v2
         with:
           context: .
           file: docker/Dockerfile
           push: true
-          tags: jmal/jdk17_ffmpeg_nvidia:latest
+          tags: |
+            jmal/jdk17_ffmpeg_nvidia:latest
+            ghcr.io/${{ secrets.GHCR_IO_USERNAME }}/jdk17_ffmpeg_nvidia:latest
           platforms: linux/amd64,linux/arm64
           build-args: |
             ARCH=${{ matrix.arch }}

diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
@@ -52,8 +52,8 @@ jobs:
           file: ./Dockerfile
           push: true
           tags: |
-            jmal/jmalcloud-nvidia:test
-            ghcr.io/${{ secrets.GHCR_IO_USERNAME }}/jmalcloud-nvidia:test
+            jmal/jmalcloud:test
+            ghcr.io/${{ secrets.GHCR_IO_USERNAME }}/jmalcloud:test
           platforms: linux/amd64,linux/arm64
           build-args: |
             VERSION=${{ env.PROJECT_VERSION }}
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM jmal/jdk17_ffmpeg:latest
+FROM jmal/jdk17_ffmpeg_nvidia:latest
 
 ARG VERSION