feat: 优化 node workflow

1Panel-dev · Aug 16, 2024 · fe86e8d · fe86e8d
1 parent 6a74f38
commit fe86e8d
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 79 deletions.
diff --git a/.github/workflows/node-release.yml b/.github/workflows/node-release.yml
@@ -41,8 +41,8 @@ jobs:
       - name: Build Node-22 and Push
         uses: docker/build-push-action@v5
         with:
-          context: node/22
-          file: node/22/Dockerfile
+          context: node
+          file: node/Dockerfile
           platforms: linux/amd64,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x
           push: true
           build-args:
@@ -56,8 +56,8 @@ jobs:
       - name: Build Node-21 and Push
         uses: docker/build-push-action@v5
         with:
-          context: node/21
-          file: node/21/Dockerfile
+          context: node
+          file: node/Dockerfile
           platforms: linux/amd64,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x
           push: true
           build-args:
@@ -71,8 +71,8 @@ jobs:
       - name: Build Node-20 and Push
         uses: docker/build-push-action@v5
         with:
-          context: node/20
-          file: node/20/Dockerfile
+          context: node
+          file: node/Dockerfile
           platforms: linux/amd64,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x
           push: true
           build-args:
@@ -86,8 +86,8 @@ jobs:
       - name: Build Node-18 and Push
         uses: docker/build-push-action@v5
         with:
-          context: node/18
-          file: node/18/Dockerfile
+          context: node
+          file: node/Dockerfile
           platforms: linux/amd64,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x
           push: true
           build-args:

diff --git a/.github/workflows/php-release.yml b/.github/workflows/php-release.yml
@@ -48,7 +48,7 @@ jobs:
         with:
           context: php
           file: php/Dockerfile
-          platforms: linux/amd64,linux/arm/v7,linux/arm64/v8
+          platforms: linux/amd64,linux/arm/v7,linux/arm64/v8,linux/s390x
           push: true
           build-args:
             PHP_VERSION=${{ github.event.inputs.php74Version }}
@@ -62,7 +62,7 @@ jobs:
         with:
           context: php
           file: php/Dockerfile
-          platforms: linux/amd64,linux/arm/v7,linux/arm64/v8
+          platforms: linux/amd64,linux/arm/v7,linux/arm64/v8,linux/s390x
           push: true
           build-args:
             PHP_VERSION=${{ github.event.inputs.php73Version }}
@@ -76,7 +76,7 @@ jobs:
         with:
           context: php
           file: php/Dockerfile
-          platforms: linux/amd64,linux/arm/v7,linux/arm64/v8
+          platforms: linux/amd64,linux/arm/v7,linux/arm64/v8,linux/s390x
           push: true
           build-args:
             PHP_VERSION=${{ github.event.inputs.php72Version }}
@@ -90,7 +90,7 @@ jobs:
         with:
           context: php
           file: php/Dockerfile
-          platforms: linux/amd64,linux/arm/v7,linux/arm64/v8
+          platforms: linux/amd64,linux/arm/v7,linux/arm64/v8,linux/s390x
           push: true
           build-args:
             PHP_VERSION=${{ github.event.inputs.php71Version }}
@@ -104,7 +104,7 @@ jobs:
         with:
           context: php
           file: php/Dockerfile
-          platforms: linux/amd64,linux/arm/v7,linux/arm64/v8
+          platforms: linux/amd64,linux/arm/v7,linux/arm64/v8,linux/s390x
           push: true
           build-args:
             PHP_VERSION=${{ github.event.inputs.php70Version }}

diff --git a/node/20/Dockerfile b/node/20/Dockerfile
diff --git a/node/20/docker-entrypoint.sh b/node/20/docker-entrypoint.sh
diff --git a/node/21/Dockerfile b/node/21/Dockerfile
diff --git a/node/21/docker-entrypoint.sh b/node/21/docker-entrypoint.sh
diff --git a/node/22/Dockerfile b/node/22/Dockerfile
diff --git a/node/22/docker-entrypoint.sh b/node/22/docker-entrypoint.sh
diff --git a/node/18/Dockerfile → node/Dockerfile b/node/18/Dockerfile → node/Dockerfile
diff --git a/node/18/docker-entrypoint.sh → node/docker-entrypoint.sh b/node/18/docker-entrypoint.sh → node/docker-entrypoint.sh