From 49e9d598605a4ed0379e81423e0b11af5c9b5e0e Mon Sep 17 00:00:00 2001
From: John <gshang2010@gmail.com>
Date: Sun, 16 Mar 2025 21:05:20 +0800
Subject: [PATCH] kms alpine:3.21

---
 .github/workflows/kms.yml | 17 +++++++++--------
 kms/Dockerfile            |  4 ++--
 kms/docker-compose.yml    | 15 +++++++++++++++
 3 files changed, 26 insertions(+), 10 deletions(-)
 create mode 100644 kms/docker-compose.yml

diff --git a/.github/workflows/kms.yml b/.github/workflows/kms.yml
index 583dda8..7c9874e 100644
--- a/.github/workflows/kms.yml
+++ b/.github/workflows/kms.yml
@@ -13,39 +13,40 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: 'Set env'
         run: |
           echo "VLMCSD_VER=$(echo `grep -n "VLMCSD_VER=" kms/Dockerfile`|awk -F= '{print $3}')" >> $GITHUB_ENV
+          echo "ALPINE_VER=$(echo `grep -n "compilingvlmcsd" kms/Dockerfile`|awk -F: '{print $3}'|awk -F' ' '{print $1}')" >> $GITHUB_ENV
 
       - name: Set up QEMU
         id: qemu
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
         with:
           platforms: all
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
         with:
           version: latest
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Login to GHCR
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v6
         with:
           context: ./kms
           file: ./kms/Dockerfile
@@ -53,9 +54,9 @@ jobs:
           push: true
           tags: |
             johngong/kms:latest
-            johngong/kms:${{ env.VLMCSD_VER }}
+            johngong/kms:${{ env.VLMCSD_VER }}-alpine-${{ env.ALPINE_VER }}
             ghcr.io/gshang2017/kms:latest
-            ghcr.io/gshang2017/kms:${{ env.VLMCSD_VER }}
+            ghcr.io/gshang2017/kms:${{ env.VLMCSD_VER }}-alpine-${{ env.ALPINE_VER }}
 
       - name: Docker Hub Description
         uses: peter-evans/dockerhub-description@v3
diff --git a/kms/Dockerfile b/kms/Dockerfile
index 7b63ffa..789cf4c 100644
--- a/kms/Dockerfile
+++ b/kms/Dockerfile
@@ -1,5 +1,5 @@
 #compiling vlmcsd
-FROM alpine:3.20 as compilingvlmcsd
+FROM alpine:3.21 AS compilingvlmcsd
 
 ARG VLMCSD_VER=1113
 
@@ -10,7 +10,7 @@ RUN apk add --no-cache git build-base \
 && make
 
 # docker vlmcsd
-FROM alpine:3.20
+FROM alpine:3.21
 
 ARG S6_VER=3.2.0.2
 ARG VLMCSD_VER=1113
diff --git a/kms/docker-compose.yml b/kms/docker-compose.yml
new file mode 100644
index 0000000..3b08a79
--- /dev/null
+++ b/kms/docker-compose.yml
@@ -0,0 +1,15 @@
+services:
+  kms:
+    # github镜像：ghcr.io/johngong/kms:latest
+    image: johngong/kms:latest
+    container_name: kms
+    ports:
+      - 1688:1688
+      - 8080:8080
+    environment:
+      UID: 1000
+      GID: 1000
+      KMS_README_WEB: true
+      KMS_README_WEB_PORT: 8080
+      VLMCSD_SERVER_PORT: 1688
+    restart: unless-stopped