添加Zulu-8/11

顺手修了别的文件
芜湖起飞

.github/sync-fix.j2

+name: 定时搬回国内
+
+# 触发条件：在 push 到 master 分支后
+on:
+  schedule:
+    - cron: "20 12 */3 * *"
+
+env:
+  TKE_USERNAME: ${{ secrets.TKE_USERNAME }}
+  TKE_PASSWORD: ${{ secrets.TKE_PASSWORD }}
+  ACR_USERNAME: ${{ secrets.ACR_USERNAME }}
+  ACR_PASSWORD: ${{ secrets.ACR_PASSWORD }}
+  HUB_USERNAME: ${{ secrets.HUB_USERNAME }}
+  HUB_PASSWORD: ${{ secrets.HUB_PASSWORD }}
+
+# 任务
+jobs:
+  {% for item in navigation %}
+  sync-adguard:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 检出代码
+        uses: actions/checkout@v2
+      - name: 准备同步工具
+        run: bash ./sync-tool/tools.sh
+      - name: 搬回国内
+        run: ./image-syncer -r 5 --auth ./sync-tool/auth.json --images ./adguard/adguard.yml
+   {% endfor %}
+
+   
\ No newline at end of file

.github/sync-fix.yml

+name: 定时搬回国内
+
+# 触发条件：在 push 到 master 分支后
+on:
+  schedule:
+    - cron: "20 12 */3 * *"
+
+env:
+  TKE_USERNAME: ${{ secrets.TKE_USERNAME }}
+  TKE_PASSWORD: ${{ secrets.TKE_PASSWORD }}
+  ACR_USERNAME: ${{ secrets.ACR_USERNAME }}
+  ACR_PASSWORD: ${{ secrets.ACR_PASSWORD }}
+  HUB_USERNAME: ${{ secrets.HUB_USERNAME }}
+  HUB_PASSWORD: ${{ secrets.HUB_PASSWORD }}
+
+# 任务
+jobs:
+  sync-adguard:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 检出代码
+        uses: actions/checkout@v2
+      - name: 准备同步工具
+        run: bash ./sync-tool/tools.sh
+      - name: 搬回国内
+        run: ./image-syncer -r 5 --auth ./sync-tool/auth.json --images ./adguard/adguard.yml

.github/workflows/adguard.yml

@@ -7,9 +7,7 @@ on:
       - "adguard/**"
       - ".github/workflows/adguard.yml"
   schedule:
-    # UTC 每周三 早上 4:30
-    # UTC+8 每周三 中午 12:20
-    - cron: "30 4 * * 2"
+    - cron: "25 7 * * 5"
 
 env:
   TKE_USERNAME: ${{ secrets.TKE_USERNAME }}

.github/workflows/adopt-11-hotspot.yml

@@ -6,7 +6,8 @@ on:
       - "pterodactyl/base/java/Dockerfile-adopt-11-hotspot"
       - "pterodactyl/base/java/entrypoint.sh"
       - ".github/workflows/adopt-11-hotspot.yml"
-
+  schedule:
+    - cron: "30 4 * * 3"
 env:
   TKE_USERNAME: ${{ secrets.TKE_USERNAME }}
   TKE_PASSWORD: ${{ secrets.TKE_PASSWORD }}

.github/workflows/adopt-11-openj9.yml

@@ -6,7 +6,8 @@ on:
       - "pterodactyl/base/java/Dockerfile-adopt-11-openj9"
       - "pterodactyl/base/java/entrypoint.sh"
       - ".github/workflows/adopt-11-openj9.yml"
-
+  schedule:
+    - cron: "30 4 * * 3"
 env:
   TKE_USERNAME: ${{ secrets.TKE_USERNAME }}
   TKE_PASSWORD: ${{ secrets.TKE_PASSWORD }}

.github/workflows/adopt-8-hotspot.yml

@@ -6,7 +6,8 @@ on:
       - "pterodactyl/base/java/Dockerfile-adopt-8-hotspot"
       - "pterodactyl/base/java/entrypoint.sh"
       - ".github/workflows/adopt-8-hotspot.yml"
-
+  schedule:
+    - cron: "30 4 * * 3"
 env:
   TKE_USERNAME: ${{ secrets.TKE_USERNAME }}
   TKE_PASSWORD: ${{ secrets.TKE_PASSWORD }}

.github/workflows/adopt-8-openj9.yml

@@ -6,7 +6,8 @@ on:
       - "pterodactyl/base/java/Dockerfile-adopt-8-openj9"
       - "pterodactyl/base/java/entrypoint.sh"
       - ".github/workflows/adopt-8-openj9.yml"
-
+  schedule:
+    - cron: "30 4 * * 3"
 env:
   TKE_USERNAME: ${{ secrets.TKE_USERNAME }}
   TKE_PASSWORD: ${{ secrets.TKE_PASSWORD }}

.github/workflows/ark-survival-evolved.yml

@@ -6,7 +6,8 @@ on:
     paths:
       - "pterodactyl/steam/ark-survival-evolved/**"
       - ".github/workflows/ark-survival-evolved.yml"
-
+  schedule:
+    - cron: "45 6 5 * *"
 env:
   TKE_USERNAME: ${{ secrets.TKE_USERNAME }}
   TKE_PASSWORD: ${{ secrets.TKE_PASSWORD }}

.github/workflows/corretto-11.yml

@@ -6,7 +6,8 @@ on:
       - "pterodactyl/base/java/Dockerfile-corretto-11"
       - "pterodactyl/base/java/entrypoint.sh"
       - ".github/workflows/corretto-11.yml"
-
+  schedule:
+    - cron: "30 4 * * 3"
 env:
   TKE_USERNAME: ${{ secrets.TKE_USERNAME }}
   TKE_PASSWORD: ${{ secrets.TKE_PASSWORD }}

.github/workflows/corretto-8.yml

@@ -6,7 +6,8 @@ on:
       - "pterodactyl/base/java/Dockerfile-corretto-8"
       - "pterodactyl/base/java/entrypoint.sh"
       - ".github/workflows/corretto-8.yml"
-
+  schedule:
+    - cron: "30 4 * * 3"
 env:
   TKE_USERNAME: ${{ secrets.TKE_USERNAME }}
   TKE_PASSWORD: ${{ secrets.TKE_PASSWORD }}

.github/workflows/dnsmasq.yml

@@ -7,9 +7,7 @@ on:
       - "dnsmasq/**"
       - ".github/workflows/dnsmasq.yml"
   schedule:
-    # UTC 每周三 早上 4:30
-    # UTC+8 每周三 中午 12:20
-    - cron: "30 4 * * 2"
+    - cron: "25 7 * * 5"
 
 env:
   TKE_USERNAME: ${{ secrets.TKE_USERNAME }}

.github/workflows/icelakes.yml

@@ -6,7 +6,8 @@ on:
     paths:
       - "pterodactyl/steam/icelakes/**"
       - ".github/workflows/icelakes.yml"
-
+  schedule:
+    - cron: "45 6 5 * *"
 env:
   TKE_USERNAME: ${{ secrets.TKE_USERNAME }}
   TKE_PASSWORD: ${{ secrets.TKE_PASSWORD }}

.github/workflows/l7rsc2.yml

@@ -7,9 +7,7 @@ on:
       - "l7rsc2/**"
       - ".github/workflows/l7rsc2.yml"
   schedule:
-    # UTC 每周三 早上 4:30
-    # UTC+8 每周三 中午 12:20
-    - cron: "30 4 * * 2"
+    - cron: "25 7 * * 5"
 
 env:
   TKE_USERNAME: ${{ secrets.TKE_USERNAME }}

.github/workflows/mordhau.yml

@@ -6,7 +6,8 @@ on:
     paths:
       - "pterodactyl/steam/mordhau/**"
       - ".github/workflows/mordhau.yml"
-
+  schedule:
+    - cron: "45 6 5 * *"
 env:
   TKE_USERNAME: ${{ secrets.TKE_USERNAME }}
   TKE_PASSWORD: ${{ secrets.TKE_PASSWORD }}

.github/workflows/openjdk-11.yml

@@ -6,7 +6,8 @@ on:
       - "pterodactyl/base/java/Dockerfile-openjdk-11"
       - "pterodactyl/base/java/entrypoint.sh"
       - ".github/workflows/openjdk-11.yml"
-
+  schedule:
+    - cron: "30 4 * * 3"
 env:
   TKE_USERNAME: ${{ secrets.TKE_USERNAME }}
   TKE_PASSWORD: ${{ secrets.TKE_PASSWORD }}

.github/workflows/openjdk-7.yml

@@ -6,7 +6,8 @@ on:
       - "pterodactyl/base/java/Dockerfile-openjdk-7"
       - "pterodactyl/base/java/entrypoint.sh"
       - ".github/workflows/openjdk-7.yml"
-
+  schedule:
+    - cron: "30 4 * * 3"
 env:
   TKE_USERNAME: ${{ secrets.TKE_USERNAME }}
   TKE_PASSWORD: ${{ secrets.TKE_PASSWORD }}

.github/workflows/openjdk-8.yml

@@ -6,7 +6,8 @@ on:
       - "pterodactyl/base/java/Dockerfile-openjdk-8"
       - "pterodactyl/base/java/entrypoint.sh"
       - ".github/workflows/openjdk-8.yml"
-
+  schedule:
+    - cron: "30 4 * * 3"
 env:
   TKE_USERNAME: ${{ secrets.TKE_USERNAME }}
   TKE_PASSWORD: ${{ secrets.TKE_PASSWORD }}

.github/workflows/php-fpm.yml

@@ -7,9 +7,7 @@ on:
       - "php-fpm/**"
       - ".github/workflows/php-fpm.yml"
   schedule:
-    # UTC 每周三 早上 4:30
-    # UTC+8 每周三 中午 12:20
-    - cron: "30 4 * * 2"
+    - cron: "25 7 * * 5"
 
 env:
   TKE_USERNAME: ${{ secrets.TKE_USERNAME }}

.github/workflows/smartdns.yml

@@ -7,9 +7,7 @@ on:
       - "smartdns/**"
       - ".github/workflows/smartdnsyml"
   schedule:
-    # UTC 每周三 早上 4:30
-    # UTC+8 每周三 中午 12:20
-    - cron: "30 4 * * 2"
+    - cron: "25 7 * * 5"
 
 env:
   TKE_USERNAME: ${{ secrets.TKE_USERNAME }}

.github/workflows/unturned.yml

@@ -6,7 +6,8 @@ on:
     paths:
       - "pterodactyl/steam/unturned/**"
       - ".github/workflows/unturned.yml"
-
+  schedule:
+    - cron: "45 6 5 * *"
 env:
   TKE_USERNAME: ${{ secrets.TKE_USERNAME }}
   TKE_PASSWORD: ${{ secrets.TKE_PASSWORD }}

.github/workflows/zulu-11.yml

+name: 构建 zulu-11 镜像
+
+on:
+  push:
+    paths:
+      - "pterodactyl/base/java/Dockerfile-zulu-11"
+      - "pterodactyl/base/java/entrypoint.sh"
+      - ".github/workflows/zulu-11.yml"
+  schedule:
+    - cron: "30 4 * * 3"
+env:
+  TKE_USERNAME: ${{ secrets.TKE_USERNAME }}
+  TKE_PASSWORD: ${{ secrets.TKE_PASSWORD }}
+  ACR_USERNAME: ${{ secrets.ACR_USERNAME }}
+  ACR_PASSWORD: ${{ secrets.ACR_PASSWORD }}
+  HUB_USERNAME: ${{ secrets.HUB_USERNAME }}
+  HUB_PASSWORD: ${{ secrets.HUB_PASSWORD }}
+
+# 任务
+jobs:
+  build-zulu-11:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 检出代码
+        uses: actions/checkout@v2
+      - name: 构建 zulu-11 镜像
+        uses: docker/build-push-action@v1
+        with:
+          username: ${{ secrets.HUB_USERNAME }}
+          password: ${{ secrets.HUB_PASSWORD }}
+          path: ./pterodactyl/base/java
+          dockerfile: ./pterodactyl/base/java/Dockerfile-zulu-11
+          registry: docker.io
+          repository: gzzchh/pter-base
+          tags: zulu-11
+
+  sync-back:
+    runs-on: ubuntu-latest
+    needs:
+      - build-zulu-11
+    steps:
+      - name: 检出代码
+        uses: actions/checkout@v2
+      - name: 准备同步工具
+        run: bash ./sync-tool/tools.sh
+      - name: 搬回国内
+        run: ./image-syncer -r 5 --auth ./sync-tool/auth.json --images ./pterodactyl/base/java/zulu-11.yml

.github/workflows/zulu-8.yml

+name: 构建 zulu-8 镜像
+
+on:
+  push:
+    paths:
+      - "pterodactyl/base/java/Dockerfile-zulu-8"
+      - "pterodactyl/base/java/entrypoint.sh"
+      - ".github/workflows/zulu-8.yml"
+  schedule:
+    - cron: "30 4 * * 3"
+env:
+  TKE_USERNAME: ${{ secrets.TKE_USERNAME }}
+  TKE_PASSWORD: ${{ secrets.TKE_PASSWORD }}
+  ACR_USERNAME: ${{ secrets.ACR_USERNAME }}
+  ACR_PASSWORD: ${{ secrets.ACR_PASSWORD }}
+  HUB_USERNAME: ${{ secrets.HUB_USERNAME }}
+  HUB_PASSWORD: ${{ secrets.HUB_PASSWORD }}
+
+# 任务
+jobs:
+  build-zulu-8:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 检出代码
+        uses: actions/checkout@v2
+      - name: 构建 zulu-8 镜像
+        uses: docker/build-push-action@v1
+        with:
+          username: ${{ secrets.HUB_USERNAME }}
+          password: ${{ secrets.HUB_PASSWORD }}
+          path: ./pterodactyl/base/java
+          dockerfile: ./pterodactyl/base/java/Dockerfile-zulu-8
+          registry: docker.io
+          repository: gzzchh/pter-base
+          tags: zulu-8
+
+  sync-back:
+    runs-on: ubuntu-latest
+    needs:
+      - build-zulu-8
+    steps:
+      - name: 检出代码
+        uses: actions/checkout@v2
+      - name: 准备同步工具
+        run: bash ./sync-tool/tools.sh
+      - name: 搬回国内
+        run: ./image-syncer -r 5 --auth ./sync-tool/auth.json --images ./pterodactyl/base/java/zulu-8.yml

README.md

 # image-build
-Auto Build My Docker Images
+
+| 类型               | 构建周期              | Cron             |
+| ------------------ | --------------------- | ---------------- |
+| P73R0d4c7YL\-base  | 每周三 早上 4:30      | 30 4 \* \* 3     |
+| P73R0d4c7YL\-steam | 每个月 5 号 早上 6:45 | 45 6 5 \* \*     |
+| other              | 每周五 早上 7:25      | 25 7 \* \* 5     |
+| 同步               | 每三天 中午 12:20     | 20 12 \*/3 \* \* |

genSyncJobs.py

+import os
+import yaml
+
+
+def getFileLength(fname):
+    with open(fname) as f:
+        for i, l in enumerate(f):
+            pass
+    return i + 1
+
+
+def genRunCommand(filename):
+    commandRaw = "./image-syncer -r 5 --auth ./sync-tool/auth.json --images "+filename
+
+
+jobList = []
+fileList = []
+for root, dirs, files in os.walk(".", topdown=False):
+    # 不扫描隐藏文件夹
+    if "./." not in root:
+        for name in files:
+            # 找所有yml
+            if str(name).endswith(".yml"):
+                filename = os.path.join(root, name)
+                # 去掉>3行的
+                if not getFileLength(filename) >= 3:
+                    jobName = os.path.splitext(name)[0]
+                    jobList.append(jobName)
+                    fileList.append(filename)
+                    # print(taskName)
+
+# print(jobList)
+# print(fileList)
+
+
+f = open(r'./.github/sync-fix.yml')
+workflow = yaml.load(f)
+workflowJob = workflow['jobs']
+workflowJob = {
+    'sync-adguard': {
+        'runs-on': 'ubuntu-latest',
+        'steps': [
+            {
+                'name': '检出代码',
+                'uses': 'actions/checkout@v2'
+            },
+            {
+                'name': '准备同步工具',
+                'run': 'bash ./sync-tool/tools.sh'
+            },
+            {
+                'name': '搬回国内',
+                'run': './image-syncer -r 5 --auth ./sync-tool/auth.json --images ./adguard/adguard.yml'
+            }
+        ]
+    }
+}
+
+for index in jobList:
+    # "sync-"+jobList[index]
+    strslice = str("sync-"+jobList[index])[::]
+    newJob = {
+        strslice: {
+            'runs-on': 'ubuntu-latest',
+            'steps': [
+                {
+                    'name': '检出代码',
+                    'uses': 'actions/checkout@v2'
+                },
+                {
+                    'name': '准备同步工具',
+                    'run': 'bash ./sync-tool/tools.sh'
+                },
+                {
+                    'name': '搬回国内',
+                    'run': './image-syncer -r 5 --auth ./sync-tool/auth.json --images ./adguard/adguard.yml'
+                }
+            ]
+        }
+    }
+
+    print(newJob)

pterodactyl/base/java/Dockerfile-zulu-11

+# ----------------------------------
+# Pterodactyl Core Dockerfile
+# Environment: AzulZulu-8
+# Minimum Panel Version: 0.6.0
+# ----------------------------------
+FROM azul/zulu-openjdk-alpine:11
+
+RUN apk --no-cache update && \
+    apk --no-cache add bash curl wget && \
+    adduser -D -h /home/container container
+
+USER container
+ENV  USER container
+ENV  HOME /home/container
+
+WORKDIR /home/container
+
+COPY ./entrypoint.sh /entrypoint.sh
+
+CMD ["/bin/bash", "/entrypoint.sh"]

pterodactyl/base/java/Dockerfile-zulu-8

+# ----------------------------------
+# Pterodactyl Core Dockerfile
+# Environment: AzulZulu-8
+# Minimum Panel Version: 0.6.0
+# ----------------------------------
+FROM azul/zulu-openjdk-alpine:8
+
+RUN apk --no-cache update && \
+    apk --no-cache add bash curl wget && \
+    adduser -D -h /home/container container
+
+USER container
+ENV  USER container
+ENV  HOME /home/container
+
+WORKDIR /home/container
+
+COPY ./entrypoint.sh /entrypoint.sh
+
+CMD ["/bin/bash", "/entrypoint.sh"]

pterodactyl/base/java/zulu-11.yml

+gzzchh/pter-base:zulu-11: ccr.ccs.tencentyun.com/pterodactyl-cn/base:zulu-11

pterodactyl/base/java/zulu-8.yml

+gzzchh/pter-base:zulu-8: ccr.ccs.tencentyun.com/pterodactyl-cn/base:zulu-8