update

bromine0x23 · Nov 17, 2023 · 6482c5a · 6482c5a
1 parent 580c396
commit 6482c5a
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 6 deletions.
diff --git a/.github/workflows/fedora.yml b/.github/workflows/fedora.yml
@@ -30,6 +30,7 @@ jobs:
       image-build-args: |
         BASE_IMAGE=fedora:${{ matrix.fedora-version }}
         IS_SLIM=${{ matrix.is-slim && 'slim' || '' }}
+      image-build-platforms: linux/amd64
       image-name: >-
         bromine0x23/fedora
         ghcr.io/bromine0x23/fedora

diff --git a/.github/workflows/image-build.yml b/.github/workflows/image-build.yml
@@ -33,7 +33,7 @@ on:
       image-build-platforms:
         required: false
         type: string
-        default: linux/amd64,linux/arm64/v8
+        default: linux/amd64,linux/arm64
       image-name:
         required: true
         type: string

diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
@@ -13,24 +13,48 @@ on:
   - cron:  '0 8 3 * *'
 
 jobs:
+  wait-oraclelinux:
+    name: 等待上游镜像完成
+    runs-on: ubuntu-latest
+    steps:
+    - name: Wait to succeed
+      uses: lewagon/[email protected]
+      with:
+        ref: ${{ github.ref }}
+        check-name: OracleLinux
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        wait-interval: 30
+  wait-debian:
+    name: 等待上游镜像完成
+    runs-on: ubuntu-latest
+    steps:
+    - name: Wait to succeed
+      uses: lewagon/[email protected]
+      with:
+        ref: ${{ github.ref }}
+        check-name: Debian
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        wait-interval: 30
+
   java:
     uses: ./.github/workflows/image-build.yml
     name: Java
+    needs: [wait-oraclelinux, wait-debian]
     strategy:
       matrix:
         version: [21]
         variant: [jdk, jre]
-        os: [debian, fedora]
+        os: [oraclelinux, debian]
         include:
         - distribution: temurin
           version-latest: 21
           version-lts: 21
           variant-default: jdk
-          os-default: fedora
+          os-default: oraclelinux
         - os: debian
           os-version: 12
-        - os: fedora
-          os-version: 38
+        - os: oraclelinux
+          os-version: 8
     with:
       image-label-title: Java
       image-label-description: Java 工具镜像 (基于 Temurin)

diff --git a/java/temurin/fedora.dockerfile → java/temurin/oraclelinux.dockerfile b/java/temurin/fedora.dockerfile → java/temurin/oraclelinux.dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=bromine0x23/fedora
+ARG BASE_IMAGE=bromine0x23/oraclelinux
 
 # hadolint ignore=DL3006
 FROM $BASE_IMAGE