kms web add windows 11 keys

gshang2017 · Aug 28, 2023 · be3c81c · be3c81c
1 parent c8c588b
commit be3c81c
Show file tree

Hide file tree

Showing 3 changed files with 769 additions and 865 deletions.
diff --git a/.github/workflows/kms.yml b/.github/workflows/kms.yml
@@ -7,102 +7,17 @@ on:
     - 'kms/root/**'
   workflow_dispatch:
 
-env:
-  VLMCSD_VER: 1113
-
 jobs:
   job1:
-    name: buildx amd64
-    runs-on: ubuntu-18.04
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Set up QEMU
-        id: qemu
-        uses: docker/setup-qemu-action@v2
-        with:
-          platforms: all
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v2
-        with:
-          version: latest
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Login to GHCR
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: ./kms
-          file: ./kms/Dockerfile
-          platforms: linux/amd64
-          push: true
-          tags: |
-            johngong/kms:${{ env.VLMCSD_VER }}_amd64
-            ghcr.io/gshang2017/kms:${{ env.VLMCSD_VER }}_amd64
-
-  job2:
-    name: buildx arm64
-    runs-on: ubuntu-18.04
+    name:  buildx tag
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Set up QEMU
-        id: qemu
-        uses: docker/setup-qemu-action@v2
-        with:
-          platforms: all
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v2
-        with:
-          version: latest
+        uses: actions/checkout@v3
 
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Login to GHCR
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: ./kms
-          file: ./kms/Dockerfile
-          platforms: linux/arm64
-          push: true
-          tags: |
-            johngong/kms:${{ env.VLMCSD_VER }}_arm64v8
-            ghcr.io/gshang2017/kms:${{ env.VLMCSD_VER }}_arm64v8
-
-  job3:
-    name: buildx arm32v7
-    runs-on: ubuntu-18.04
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
+      - name: 'Set env'
+        run: |
+          echo "VLMCSD_VER=$(echo `grep -n "VLMCSD_VER=" kms/Dockerfile`|awk -F: '{print $3}'|cut -d "=" -f 2)" >> $GITHUB_ENV
 
       - name: Set up QEMU
         id: qemu
@@ -130,109 +45,20 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           context: ./kms
           file: ./kms/Dockerfile
-          platforms: linux/arm/v7
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: true
           tags: |
-            johngong/kms:${{ env.VLMCSD_VER }}_arm32v7
-            ghcr.io/gshang2017/kms:${{ env.VLMCSD_VER }}_arm32v7
-
-  job4:
-    needs: [job1, job2, job3]
-    name: create tags
-    runs-on: ubuntu-18.04
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Set up QEMU
-        id: qemu
-        uses: docker/setup-qemu-action@v2
-        with:
-          platforms: all
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v2
-        with:
-          version: latest
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Login to GHCR
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: create version tag
-        run: |
-          docker buildx imagetools create -t johngong/kms:${{ env.VLMCSD_VER }} \
-            johngong/kms:${{ env.VLMCSD_VER }}_amd64 \
-            johngong/kms:${{ env.VLMCSD_VER }}_arm64v8 \
-            johngong/kms:${{ env.VLMCSD_VER }}_arm32v7
-
-      - name: create version tag
-        run: |
-          docker buildx imagetools create -t johngong/kms:amd64-latest \
-            johngong/kms:${{ env.VLMCSD_VER }}_amd64
-
-      - name: create version tag
-        run: |
-          docker buildx imagetools create -t johngong/kms:arm64v8-latest \
-            johngong/kms:${{ env.VLMCSD_VER }}_arm64v8
-
-      - name: create version tag
-        run: |
-          docker buildx imagetools create -t johngong/kms:arm32v7-latest \
-            johngong/kms:${{ env.VLMCSD_VER }}_arm32v7
-
-      - name: create version tag
-        run: |
-          docker buildx imagetools create -t johngong/kms:latest \
-            johngong/kms:amd64-latest \
-            johngong/kms:arm64v8-latest \
-            johngong/kms:arm32v7-latest
-
-      - name: create version tag(ghcr.io)
-        run: |
-          docker buildx imagetools create -t ghcr.io/gshang2017/kms:amd64-latest \
-            ghcr.io/gshang2017/kms:${{ env.VLMCSD_VER }}_amd64
-
-      - name: create version tag(ghcr.io)
-        run: |
-          docker buildx imagetools create -t ghcr.io/gshang2017/kms:arm64v8-latest \
-            ghcr.io/gshang2017/kms:${{ env.VLMCSD_VER }}_arm64v8
-
-      - name: create version tag(ghcr.io)
-        run: |
-          docker buildx imagetools create -t ghcr.io/gshang2017/kms:arm32v7-latest \
-            ghcr.io/gshang2017/kms:${{ env.VLMCSD_VER }}_arm32v7
-
-      - name: create version tag(ghcr.io)
-        run: |
-          docker buildx imagetools create -t ghcr.io/gshang2017/kms:${{ env.VLMCSD_VER }} \
-            ghcr.io/gshang2017/kms:${{ env.VLMCSD_VER }}_amd64 \
-            ghcr.io/gshang2017/kms:${{ env.VLMCSD_VER }}_arm64v8 \
-            ghcr.io/gshang2017/kms:${{ env.VLMCSD_VER }}_arm32v7
-
-      - name: create version tag(ghcr.io)
-        run: |
-          docker buildx imagetools create -t ghcr.io/gshang2017/kms:latest \
-            ghcr.io/gshang2017/kms:${{ env.VLMCSD_VER }}_amd64 \
-            ghcr.io/gshang2017/kms:${{ env.VLMCSD_VER }}_arm64v8 \
-            ghcr.io/gshang2017/kms:${{ env.VLMCSD_VER }}_arm32v7
+            johngong/kms:latest
+            johngong/kms:${{ env.VLMCSD_VER }}
+            ghcr.io/gshang2017/kms:latest
+            ghcr.io/gshang2017/kms:${{ env.VLMCSD_VER }}
 
       - name: Docker Hub Description
-        uses: peter-evans/dockerhub-description@v2
+        uses: peter-evans/dockerhub-description@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}

diff --git a/kms/Dockerfile b/kms/Dockerfile
@@ -1,5 +1,5 @@
 #compiling vlmcsd
-FROM alpine:3.16 as compilingvlmcsd
+FROM alpine:3.18 as compilingvlmcsd
 
 ARG VLMCSD_VER=1113
 
@@ -10,12 +10,13 @@ RUN apk add --no-cache git build-base \
 && make
 
 # docker vlmcsd
-FROM alpine:3.16
+FROM alpine:3.18
 
-ARG S6_VER=3.1.2.1
+ARG S6_VER=3.1.5.0
 ARG VLMCSD_VER=1113
 
 ENV KMS_README_WEB=true
+ENV S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0
 
 COPY --chmod=755 root /
 COPY --from=compilingvlmcsd --chmod=755 /vlmcsd-svn${VLMCSD_VER}/bin/vlmcsd /usr/bin/vlmcsd