From c5e9f7add4798924638bab60286f22d18b51cd2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8A=E3=81=95=E3=82=80=E3=81=AE=E3=81=B2=E3=81=A8?=
 <46447427+samunohito@users.noreply.github.com>
Date: Sat, 15 Nov 2025 21:04:45 +0900
Subject: [PATCH] =?UTF-8?q?fix(ci):=20Dockle=E3=81=AECI=E3=81=8C=E8=90=BD?=
 =?UTF-8?q?=E3=81=A1=E3=82=8B=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3=20(#1679?=
 =?UTF-8?q?4)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(ci): DockleのCIが落ちるのを修正

* fix

* fix

* fix

* fix

* fix

* downgrade dockle

* fix
---
 .github/workflows/dockle.yml | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/dockle.yml b/.github/workflows/dockle.yml
index 1c0863e274..1c0fe70116 100644
--- a/.github/workflows/dockle.yml
+++ b/.github/workflows/dockle.yml
@@ -13,20 +13,36 @@ jobs:
     runs-on: ubuntu-latest
     env:
       DOCKER_CONTENT_TRUST: 1
-      DOCKLE_VERSION: 0.4.14
+      DOCKLE_VERSION: 0.4.15
+
     steps:
       - uses: actions/checkout@v4.3.0
+
       - name: Download and install dockle v${{ env.DOCKLE_VERSION }}
         run: |
           curl -L -o dockle.deb "https://github.com/goodwithtech/dockle/releases/download/v${DOCKLE_VERSION}/dockle_${DOCKLE_VERSION}_Linux-64bit.deb"
           sudo dpkg -i dockle.deb
+
       - run: |
           cp .config/docker_example.env .config/docker.env
           cp ./compose_example.yml ./compose.yml
+
       - run: |
           docker compose up -d web
-          docker tag "$(docker compose images --format json web | jq -r '.[] | .ID')" misskey-web:latest
-      - run: |
-          cmd="dockle --exit-code 1 misskey-web:latest ${image_name}"
-          echo "> ${cmd}"
-          eval "${cmd}"
+          IMAGE_ID=$(docker compose images --format json web | jq -r '.[0].ID')
+          docker tag "${IMAGE_ID}" misskey-web:latest
+
+      - name: Prune docker junk (optional but recommended)
+        run: |
+          docker system prune -af
+          docker volume prune -f
+
+      - name: Save image for Dockle
+        run: |
+          docker save misskey-web:latest -o ./misskey-web.tar
+          ls -lh ./misskey-web.tar
+
+      - name: Run Dockle with tar input
+        run: |
+          dockle --exit-code 1 --input ./misskey-web.tar
+