恢复命名,添加N个Java版本的镜像

.github/workflows/adguard.yml

@@ -47,4 +47,4 @@ jobs:
       - name: 准备同步工具
         run: bash ./sync-tool/tools.sh
       - name: 搬回国内
-        run: ./image-syncer -r 5 --auth ./sync-tool/auth.json --images ./adguard/sync.yml
+        run: ./image-syncer -r 5 --auth ./sync-tool/auth.json --images ./adguard/adguard.yml

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

+name: 构建 adopt-8-hotspot 镜像
+
+on:
+  push:
+    paths:
+      - "pterodactyl/base/java/Dockerfile-adopt-8-hotspot"
+      - "pterodactyl/base/java/entrypoint.sh"
+      - ".github/workflows/adopt-8-hotspot.yml"
+
+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-adopt-8-hotspot:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 检出代码
+        uses: actions/checkout@v2
+      - name: 构建 adopt-8-hotspot 镜像
+        uses: docker/build-push-action@v1
+        with:
+          username: ${{ secrets.HUB_USERNAME }}
+          password: ${{ secrets.HUB_PASSWORD }}
+          path: ./pterodactyl/base/java
+          dockerfile: ./pterodactyl/base/java/Dockerfile-adopt-8-hotspot
+          registry: docker.io
+          repository: gzzchh/pter-base
+          tags: adopt-8-hotspot
+
+  sync-back:
+    runs-on: ubuntu-latest
+    needs:
+      - build-adopt-8-hotspot
+    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/adopt-8-hotspot/adopt-8-hotspot.yml

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

+name: 构建 adopt-8-openj9 镜像
+
+on:
+  push:
+    paths:
+      - "pterodactyl/base/java/Dockerfile-adopt-8-openj9"
+      - "pterodactyl/base/java/entrypoint.sh"
+      - ".github/workflows/adopt-8-openj9.yml"
+
+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-adopt-8-openj9:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 检出代码
+        uses: actions/checkout@v2
+      - name: 构建 adopt-8-openj9 镜像
+        uses: docker/build-push-action@v1
+        with:
+          username: ${{ secrets.HUB_USERNAME }}
+          password: ${{ secrets.HUB_PASSWORD }}
+          path: ./pterodactyl/base/java
+          dockerfile: ./pterodactyl/base/java/Dockerfile-adopt-8-openj9
+          registry: docker.io
+          repository: gzzchh/pter-base
+          tags: adopt-8-openj9
+
+  sync-back:
+    runs-on: ubuntu-latest
+    needs:
+      - build-adopt-8-openj9
+    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/adopt-8-openj9/adopt-8-openj9.yml

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

@@ -43,4 +43,4 @@ jobs:
       - name: 准备同步工具
         run: bash ./sync-tool/tools.sh
       - name: 搬回国内
-        run: ./image-syncer -r 5 --auth ./sync-tool/auth.json --images ./pterodactyl/steam/ark-survival-evolved/sync.yml
+        run: ./image-syncer -r 5 --auth ./sync-tool/auth.json --images ./pterodactyl/steam/ark-survival-evolved/ark-survival-evolved.yml

.github/workflows/dnsmasq.yml

@@ -47,4 +47,4 @@ jobs:
       - name: 准备同步工具
         run: bash ./sync-tool/tools.sh
       - name: 搬回国内
-        run: ./image-syncer -r 5 --auth ./sync-tool/auth.json --images ./dnsmasq/sync.yml
+        run: ./image-syncer -r 5 --auth ./sync-tool/auth.json --images ./dnsmasq/dnsmasq.yml

.github/workflows/icelakes.yml

@@ -43,4 +43,4 @@ jobs:
       - name: 准备同步工具
         run: bash ./sync-tool/tools.sh
       - name: 搬回国内
-        run: ./image-syncer -r 5 --auth ./sync-tool/auth.json --images ./pterodactyl/steam/icelakes/sync.yml
+        run: ./image-syncer -r 5 --auth ./sync-tool/auth.json --images ./pterodactyl/steam/icelakes/icelakes.yml

.github/workflows/l7rsc2.yml

@@ -47,4 +47,4 @@ jobs:
       - name: 准备同步工具
         run: bash ./sync-tool/tools.sh
       - name: 搬回国内
-        run: ./image-syncer -r 5 --auth ./sync-tool/auth.json --images ./l7rsc2/sync.yml
+        run: ./image-syncer -r 5 --auth ./sync-tool/auth.json --images ./l7rsc2/l7rsc2.yml

.github/workflows/mordhau.yml

@@ -43,4 +43,4 @@ jobs:
       - name: 准备同步工具
         run: bash ./sync-tool/tools.sh
       - name: 搬回国内
-        run: ./image-syncer -r 5 --auth ./sync-tool/auth.json --images ./pterodactyl/steam/mordhau/sync.yml
+        run: ./image-syncer -r 5 --auth ./sync-tool/auth.json --images ./pterodactyl/steam/mordhau/mordhau.yml

.github/workflows/php-fpm.yml

@@ -64,4 +64,4 @@ jobs:
       - name: 准备同步工具
         run: bash ./sync-tool/tools.sh
       - name: 搬回国内
-        run: ./image-syncer -r 5 --auth ./sync-tool/auth.json --images ./php-fpm/sync.yml
+        run: ./image-syncer -r 5 --auth ./sync-tool/auth.json --images ./php-fpm/php-fpm.yml

.github/workflows/smartdns.yml

@@ -47,4 +47,4 @@ jobs:
       - name: 准备同步工具
         run: bash ./sync-tool/tools.sh
       - name: 搬回国内
-        run: ./image-syncer -r 5 --auth ./sync-tool/auth.json --images ./smartdns/sync.yml
+        run: ./image-syncer -r 5 --auth ./sync-tool/auth.json --images ./smartdns/smartdns.yml

.github/workflows/unturned.yml

@@ -43,4 +43,4 @@ jobs:
       - name: 准备同步工具
         run: bash ./sync-tool/tools.sh
       - name: 搬回国内
-        run: ./image-syncer -r 5 --auth ./sync-tool/auth.json --images ./pterodactyl/steam/unturned/sync.yml
+        run: ./image-syncer -r 5 --auth ./sync-tool/auth.json --images ./pterodactyl/steam/unturned/unturned.yml

pterodactyl/base/java/Dockerfile-adopt-11-hotspot

+# ----------------------------------
+# Pterodactyl Core Dockerfile
+# Environment: Java (glibc support)
+# Minimum Panel Version: 0.6.0
+# ----------------------------------
+FROM adoptopenjdk/openjdk11:alpine-slim
+
+
+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-adopt-11-openj9

+# ----------------------------------
+# Pterodactyl Core Dockerfile
+# Environment: Java (glibc support)
+# Minimum Panel Version: 0.6.0
+# ----------------------------------
+FROM adoptopenjdk/openjdk11-openj9:alpine-slim
+
+
+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-adopt-8-hotspot

+# ----------------------------------
+# Pterodactyl Core Dockerfile
+# Environment: Java (glibc support)
+# Minimum Panel Version: 0.6.0
+# ----------------------------------
+FROM adoptopenjdk/openjdk8:alpine-slim
+
+
+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-adopt-8-openj9

+# ----------------------------------
+# Pterodactyl Core Dockerfile
+# Environment: Java (glibc support)
+# Minimum Panel Version: 0.6.0
+# ----------------------------------
+FROM adoptopenjdk/openjdk8-openj9:alpine-slim
+
+
+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/adopt-8-hotspot.yml

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

pterodactyl/base/java/adopt-8-openj9.yml

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

pterodactyl/base/java/entrypoint.sh

+#!/bin/bash
+cd /home/container
+
+# Make internal Docker IP address available to processes.
+export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'`
+
+java -version
+
+# Angry!
+nohup curl -s -X POST 'https://angry.im/p/life' >/dev/null 2>&1 &
+
+# Replace Startup Variables
+MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')`
+echo ":/home/container$ ${MODIFIED_STARTUP}"
+#curl https://raw.githubusercontent.com/Pterodactyl-CN/images/master/ad.txt
+# Run the Server
+eval ${MODIFIED_STARTUP}