ci: 🎡 优化镜像构建

monlor · May 30, 2024 · 813d088 · 813d088
1 parent b195328
commit 813d088
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
@@ -6,6 +6,9 @@ on:
       - main
     tags:
       - '*'
+    paths-ignore:
+      - 'README.md'
+      - 'install.sh'
 
 jobs:
   build-and-push:
@@ -51,6 +54,8 @@ jobs:
             ghcr.io/${{ github.repository_owner }}/xiaoya-alist:latest
             ${{ env.IS_TAG == 'true' && 'ghcr.io/${{ github.repository_owner }}/xiaoya-alist:${{ env.VERSION }}' || '' }}
           platforms: linux/amd64,linux/arm64
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
 
       - name: Build and push xiaoya-glue
         uses: docker/build-push-action@v4
@@ -61,6 +66,8 @@ jobs:
             ghcr.io/${{ github.repository_owner }}/xiaoya-glue:latest
             ${{ env.IS_TAG == 'true' && 'ghcr.io/${{ github.repository_owner }}/xiaoya-glue:${{ env.VERSION }}' || '' }}
           platforms: linux/amd64,linux/arm64
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
 
       - name: Build and push xiaoya-emby
         uses: docker/build-push-action@v4
@@ -71,6 +78,8 @@ jobs:
             ghcr.io/${{ github.repository_owner }}/xiaoya-emby:latest
             ${{ env.IS_TAG == 'true' && 'ghcr.io/${{ github.repository_owner }}/xiaoya-emby:${{ env.VERSION }}' || '' }}
           platforms: linux/amd64,linux/arm64
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
 
       - name: Build and push xiaoya-jellyfin
         uses: docker/build-push-action@v4
@@ -81,6 +90,8 @@ jobs:
             ghcr.io/${{ github.repository_owner }}/xiaoya-jellyfin:latest
             ${{ env.IS_TAG == 'true' && 'ghcr.io/${{ github.repository_owner }}/xiaoya-jellyfin:${{ env.VERSION }}' || '' }}
           platforms: linux/amd64,linux/arm64
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
 
       - name: Build and push xiaoya-resilio
         uses: docker/build-push-action@v4
@@ -91,4 +102,6 @@ jobs:
             ghcr.io/${{ github.repository_owner }}/xiaoya-resilio:latest
             ${{ env.IS_TAG == 'true' && 'ghcr.io/${{ github.repository_owner }}/xiaoya-resilio:${{ env.VERSION }}' || '' }}
           platforms: linux/amd64,linux/arm64
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
 
diff --git a/install.sh b/install.sh
@@ -30,6 +30,12 @@ if ! command -v docker &> /dev/null; then
   fi
 fi
 
+# 检查是否安装了compose插件,docker compose 命令
+if ! docker compose &> /dev/null; then
+  echo "系统未安装docker compose插件，退出程序..."
+  exit 1
+fi
+
 # 检查服务是否已经运行
 echo "检查服务是否已经运行..."
 service_exist=0

diff --git a/jellyfin/entrypoint.sh b/jellyfin/entrypoint.sh
@@ -23,7 +23,7 @@ if echo "${ALIST_DOMAIN}" | grep -E -q '^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-
     echo "Alist IP address: $IP"
 else
     # 使用 nslookup 解析 Alist 域名
-    IP=$(nslookup "${ALIST_DOMAIN:=alist}" | grep -Eo '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | head -n 1)
+    IP=$(nslookup "${ALIST_DOMAIN}" | awk '/^Address: / { print $2 }' | tail -n 1)
 
     # 检查 IP 地址是否解析成功
     if [ -z "$IP" ]; then