Fix missing deps

lufei · Oct 11, 2024 · 6dac1d5 · 6dac1d5
1 parent 740aa45
commit 6dac1d5
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 50 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,9 +16,9 @@ jobs:
       - name: Checkout the repo
         uses: actions/checkout@v4
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub
         uses: docker/login-action@v3
         with:
@@ -31,7 +31,7 @@ jobs:
         env:
           dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
           platforms: ${{ steps.generate.outputs.PLATFORM }}
@@ -52,9 +52,9 @@ jobs:
       - name: Checkout the repo
         uses: actions/checkout@v4
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub
         uses: docker/login-action@v3
         with:
@@ -67,7 +67,7 @@ jobs:
         env:
           dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
           platforms: ${{ steps.generate.outputs.PLATFORM }}
@@ -88,9 +88,9 @@ jobs:
       - name: Checkout the repo
         uses: actions/checkout@v4
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub
         uses: docker/login-action@v3
         with:
@@ -103,7 +103,7 @@ jobs:
         env:
           dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
           platforms: ${{ steps.generate.outputs.PLATFORM }}
@@ -124,9 +124,9 @@ jobs:
       - name: Checkout the repo
         uses: actions/checkout@v4
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub
         uses: docker/login-action@v3
         with:
@@ -139,7 +139,7 @@ jobs:
         env:
           dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
           platforms: ${{ steps.generate.outputs.PLATFORM }}
@@ -159,9 +159,9 @@ jobs:
       - name: Checkout the repo
         uses: actions/checkout@v4
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub
         uses: docker/login-action@v3
         with:
@@ -174,7 +174,7 @@ jobs:
         env:
           dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
           platforms: ${{ steps.generate.outputs.PLATFORM }}
@@ -195,9 +195,9 @@ jobs:
       - name: Checkout the repo
         uses: actions/checkout@v4
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub
         uses: docker/login-action@v3
         with:
@@ -210,7 +210,7 @@ jobs:
         env:
           dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
           platforms: ${{ steps.generate.outputs.PLATFORM }}
@@ -231,9 +231,9 @@ jobs:
       - name: Checkout the repo
         uses: actions/checkout@v4
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub
         uses: docker/login-action@v3
         with:
@@ -246,7 +246,7 @@ jobs:
         env:
           dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
           platforms: ${{ steps.generate.outputs.PLATFORM }}
@@ -267,9 +267,9 @@ jobs:
       - name: Checkout the repo
         uses: actions/checkout@v4
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub
         uses: docker/login-action@v3
         with:
@@ -282,7 +282,7 @@ jobs:
         env:
           dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
           platforms: ${{ steps.generate.outputs.PLATFORM }}
@@ -302,9 +302,9 @@ jobs:
       - name: Checkout the repo
         uses: actions/checkout@v4
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub
         uses: docker/login-action@v3
         with:
@@ -317,7 +317,7 @@ jobs:
         env:
           dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
           platforms: ${{ steps.generate.outputs.PLATFORM }}
@@ -338,9 +338,9 @@ jobs:
       - name: Checkout the repo
         uses: actions/checkout@v4
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub
         uses: docker/login-action@v3
         with:
@@ -353,7 +353,7 @@ jobs:
         env:
           dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
           platforms: ${{ steps.generate.outputs.PLATFORM }}
@@ -374,9 +374,9 @@ jobs:
       - name: Checkout the repo
         uses: actions/checkout@v4
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub
         uses: docker/login-action@v3
         with:
@@ -389,7 +389,7 @@ jobs:
         env:
           dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
           platforms: ${{ steps.generate.outputs.PLATFORM }}
@@ -409,9 +409,9 @@ jobs:
       - name: Checkout the repo
         uses: actions/checkout@v4
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub
         uses: docker/login-action@v3
         with:
@@ -424,7 +424,7 @@ jobs:
         env:
           dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
           platforms: ${{ steps.generate.outputs.PLATFORM }}
@@ -445,9 +445,9 @@ jobs:
       - name: Checkout the repo
         uses: actions/checkout@v4
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub
         uses: docker/login-action@v3
         with:
@@ -460,7 +460,7 @@ jobs:
         env:
           dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
           platforms: ${{ steps.generate.outputs.PLATFORM }}
@@ -481,9 +481,9 @@ jobs:
       - name: Checkout the repo
         uses: actions/checkout@v4
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub
         uses: docker/login-action@v3
         with:
@@ -496,7 +496,7 @@ jobs:
         env:
           dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
           platforms: ${{ steps.generate.outputs.PLATFORM }}

diff --git a/Dockerfile.base b/Dockerfile.base
@@ -30,8 +30,8 @@ RUN sed -i "s/<shell>/$(use bash sh)/g" /bin/init_typecho \
         `use libfreetype6-dev freetype-dev` \
         `use libjpeg62-turbo-dev libjpeg-turbo-dev` \
         `use libpq-dev postgresql-dev` \
-        libpng-dev \
-        libzip-dev \
+        libpng-dev libpng16-16 \
+        libzip-dev libzip4 zlib1g-dev \
         libwebp-dev \
         $PHPIZE_DEPS \
         unzip \

diff --git a/make-workflows.sh b/make-workflows.sh
@@ -47,23 +47,25 @@ EOF)
     runs-on: ubuntu-latest
 ${needs}
     steps:
-      - name: Checkout the repo 
-        uses: actions/checkout@v2 
+      - name: Checkout the repo
+        uses: actions/checkout@v4
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub
-        uses: docker/login-action@v1 
+        uses: docker/login-action@v3
         with:
           username: \${{ secrets.DOCKERHUB_USERNAME }}
           password: \${{ secrets.DOCKERHUB_TOKEN }}
       - name: Generate Dockerfile
         id: generate
         run: |
           ./build.sh -g -v \${{ github.event.inputs.version }} -p ${p} -o ${o} ${f}
+        env:
+          dockerhub_username: \${{ secrets.DOCKERHUB_USERNAME }}
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
           context: .
           platforms: \${{ steps.generate.outputs.PLATFORM }}