From cab700e6fb17d11ff65791a7137bf0d25aa825b1 Mon Sep 17 00:00:00 2001
From: syui <syui@syui.ai>
Date: Fri, 27 Feb 2026 17:07:38 +0900
Subject: [PATCH] fix docker

---
 .gitea/workflows/release.yml  | 21 ++++++++++++---
 .github/workflows/release.yml | 48 ++++++++++++-----------------------
 2 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml
index 852f7ec..b254aaa 100644
--- a/.gitea/workflows/release.yml
+++ b/.gitea/workflows/release.yml
@@ -1,4 +1,4 @@
-name: build and push image
+name: release
 
 on:
   schedule:
@@ -7,10 +7,10 @@ on:
 
 env:
   TAG: latest
-  IMAGE_ID: aios
   IMAGE_NAME: ${{ gitea.repository }}
   APP_TOKEN: ${{ secrets.APP_TOKEN }}
   REGISTRY: localhost:8088
+  GITEA_URL: https://git.syui.ai
 
 jobs:
   release:
@@ -20,10 +20,25 @@ jobs:
       image: ghcr.io/syui/aios
       options: --privileged
     steps:
-      - name: Pull and re-tag image
+      - name: Pull and push to local registry
         run: |
           pacman -Sy --noconfirm docker
           docker pull ghcr.io/syui/aios
           docker tag ghcr.io/syui/aios ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.TAG }}
           echo "${{ env.APP_TOKEN }}" | docker login ${{ env.REGISTRY }} -u syui --password-stdin
           docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.TAG }}
+
+      - name: Create release with tarball
+        run: |
+          curl -s -o aios.tar.gz -L "https://github.com/syui/aios/releases/download/latest/aios.tar.gz"
+          existing=$(curl -s -H "Authorization: token ${{ env.APP_TOKEN }}" "${{ env.GITEA_URL }}/api/v1/repos/${{ env.IMAGE_NAME }}/releases/tags/${{ env.TAG }}" | grep -o '"id":[0-9]*' | head -1 | cut -d: -f2)
+          if [ -n "$existing" ]; then
+            curl -s -X DELETE -H "Authorization: token ${{ env.APP_TOKEN }}" "${{ env.GITEA_URL }}/api/v1/repos/${{ env.IMAGE_NAME }}/releases/$existing"
+          fi
+          git tag -f ${{ env.TAG }} 2>/dev/null || true
+          release_id=$(curl -s -X POST -H "Authorization: token ${{ env.APP_TOKEN }}" -H "Content-Type: application/json" \
+            -d '{"tag_name":"${{ env.TAG }}","name":"${{ env.TAG }}","body":"build '$(date +%Y.%m.%d)'"}' \
+            "${{ env.GITEA_URL }}/api/v1/repos/${{ env.IMAGE_NAME }}/releases" | grep -o '"id":[0-9]*' | head -1 | cut -d: -f2)
+          curl -s -X POST -H "Authorization: token ${{ env.APP_TOKEN }}" \
+            -F "attachment=@aios.tar.gz" \
+            "${{ env.GITEA_URL }}/api/v1/repos/${{ env.IMAGE_NAME }}/releases/$release_id/assets"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 94d38ad..3a89cfb 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -7,53 +7,37 @@ on:
 
 permissions:
   contents: write
-  packages: write
 
 env:
-  DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
-  IMAGE_NAME: ${{ github.repository }}
-  GITHUB_TOKEN: ${{ secrets.APP_TOKEN }}
-  REGISTRY: ghcr.io
+  APP_TOKEN: ${{ secrets.APP_TOKEN }}
 
 jobs:
   release:
     name: Release
     runs-on: ubuntu-latest
-    container:
-      image: archlinux
-      options: --privileged
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Install build dependencies
-        run: pacman -Sy --noconfirm arch-install-scripts zsh
-
       - name: Build aios
-        run: zsh ./build.zsh
-
-      - name: Create Docker images
         run: |
-          tar -C ./root.x86_64 -c . | docker import - ${{ env.IMAGE_NAME }}
-          echo "${{ env.DOCKER_TOKEN }}" | docker login -u syui --password-stdin
-          docker push ${{ env.IMAGE_NAME }}
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ env.GITHUB_TOKEN }}
+          docker run --rm --privileged \
+            -v ${{ github.workspace }}:/work -w /work \
+            archlinux:latest \
+            bash -c "pacman -Sy --noconfirm arch-install-scripts zsh && zsh ./build.zsh"
 
       - name: Push to GitHub Container Registry
         run: |
-          docker tag ${{ env.IMAGE_NAME }} ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          cat aios.tar.gz | docker import - syui/aios
+          echo "${{ env.APP_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+          docker tag syui/aios ghcr.io/syui/aios
+          docker push ghcr.io/syui/aios
 
       - name: Create new release
-        uses: softprops/action-gh-release@v1
-        with:
-          name: latest
-          tag_name: latest
-          files:
-            aios.tar.gz
+        env:
+          GH_TOKEN: ${{ env.APP_TOKEN }}
+        run: |
+          gh release delete latest --yes --cleanup-tag || true
+          git tag -f latest
+          git push -f origin latest
+          gh release create latest aios.tar.gz --title "latest" --notes "build $(date +%Y.%m.%d)"