添加 OpenJDK-7

添加 OpenJDK-8 添加 OpenJDK-11 添加 Corretto-8 添加 Corretto-11 更新 Adopt-8-Hotspot 更新 Adopt-8-OpenJ9 更新 Adopt-11-Hotspot 更新 Adopt-11-OpenJ9

添加 OpenJDK-7
添加 OpenJDK-8 添加 OpenJDK-11 添加 Corretto-8 添加 Corretto-11 更新 Adopt-8-Hotspot 更新 Adopt-8-OpenJ9 更新 Adopt-11-Hotspot 更新 Adopt-11-OpenJ9
a6bc726c · Li Mi · 2d86ce6c · a6bc726c · a6bc726c · a6bc726c
Commit a6bc726c authored Sep 20, 2020 by Li Mi
20 changed files
--- a/.github/workflows/corretto-11.yml
+++ b/.github/workflows/corretto-11.yml
+name: 构建 corretto-11 镜像
+
+on:
+  push:
+    paths:
+      - "pterodactyl/base/java/Dockerfile-corretto-11"
+      - "pterodactyl/base/java/entrypoint.sh"
+      - ".github/workflows/corretto-11.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-corretto-11:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 检出代码
+        uses: actions/checkout@v2
+      - name: 构建 corretto-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-corretto-11
+          registry: docker.io
+          repository: gzzchh/pter-base
+          tags: corretto-11
+
+  sync-back:
+    runs-on: ubuntu-latest
+    needs:
+      - build-corretto-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/corretto-11.yml
--- a/.github/workflows/corretto-8.yml
+++ b/.github/workflows/corretto-8.yml
+name: 构建 corretto-8 镜像
+
+on:
+  push:
+    paths:
+      - "pterodactyl/base/java/Dockerfile-corretto-8"
+      - "pterodactyl/base/java/entrypoint.sh"
+      - ".github/workflows/corretto-8.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-corretto-8:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 检出代码
+        uses: actions/checkout@v2
+      - name: 构建 corretto-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-corretto-8
+          registry: docker.io
+          repository: gzzchh/pter-base
+          tags: corretto-8
+
+  sync-back:
+    runs-on: ubuntu-latest
+    needs:
+      - build-corretto-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/corretto-8.yml
--- a/.github/workflows/openjdk-11.yml
+++ b/.github/workflows/openjdk-11.yml
+name: 构建 openjdk-11 镜像
+
+on:
+  push:
+    paths:
+      - "pterodactyl/base/java/Dockerfile-openjdk-11"
+      - "pterodactyl/base/java/entrypoint.sh"
+      - ".github/workflows/openjdk-11.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-openjdk-11:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 检出代码
+        uses: actions/checkout@v2
+      - name: 构建 openjdk-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-openjdk-11
+          registry: docker.io
+          repository: gzzchh/pter-base
+          tags: openjdk-11
+
+  sync-back:
+    runs-on: ubuntu-latest
+    needs:
+      - build-openjdk-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/openjdk-11.yml
--- a/.github/workflows/openjdk-7.yml
+++ b/.github/workflows/openjdk-7.yml
+name: 构建 openjdk-7 镜像
+
+on:
+  push:
+    paths:
+      - "pterodactyl/base/java/Dockerfile-openjdk-7"
+      - "pterodactyl/base/java/entrypoint.sh"
+      - ".github/workflows/openjdk-7.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-openjdk-7:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 检出代码
+        uses: actions/checkout@v2
+      - name: 构建 openjdk-7 镜像
+        uses: docker/build-push-action@v1
+        with:
+          username: ${{ secrets.HUB_USERNAME }}
+          password: ${{ secrets.HUB_PASSWORD }}
+          path: ./pterodactyl/base/java
+          dockerfile: ./pterodactyl/base/java/Dockerfile-openjdk-7
+          registry: docker.io
+          repository: gzzchh/pter-base
+          tags: openjdk-7
+
+  sync-back:
+    runs-on: ubuntu-latest
+    needs:
+      - build-openjdk-7
+    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/openjdk-7.yml
--- a/.github/workflows/openjdk-8.yml
+++ b/.github/workflows/openjdk-8.yml
+name: 构建 openjdk-8 镜像
+
+on:
+  push:
+    paths:
+      - "pterodactyl/base/java/Dockerfile-openjdk-8"
+      - "pterodactyl/base/java/entrypoint.sh"
+      - ".github/workflows/openjdk-8.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-openjdk-8:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 检出代码
+        uses: actions/checkout@v2
+      - name: 构建 openjdk-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-openjdk-8
+          registry: docker.io
+          repository: gzzchh/pter-base
+          tags: openjdk-8
+
+  sync-back:
+    runs-on: ubuntu-latest
+    needs:
+      - build-openjdk-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/openjdk-8.yml
--- a/.github/workflows/sync-fix.yml
+++ b/.github/workflows/sync-fix.yml
+name: 定时搬回国内
+
+# 触发条件：在 push 到 master 分支后
+on:
+  schedule:
+    # UTC 四小时一次
+    # UTC+8 四小时一次
+    - cron: "* */4 * * *"
+
+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-back:
+    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 ./pterodactyl/steam/unturned/unturned.yml
--- a/pterodactyl/base/java/Dockerfile-adopt-11-hotspot
+++ b/pterodactyl/base/java/Dockerfile-adopt-11-hotspot
 # ----------------------------------
 # Pterodactyl Core Dockerfile
-# Environment: Java (glibc support)
+# Environment: AdoptOpenJDK-11-Hotspot
 # 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

--- a/pterodactyl/base/java/Dockerfile-adopt-11-openj9
+++ b/pterodactyl/base/java/Dockerfile-adopt-11-openj9
 # ----------------------------------
 # Pterodactyl Core Dockerfile
-# Environment: Java (glibc support)
+# Environment: AdoptOpenJDK-11-OpenJ9
 # 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

--- a/pterodactyl/base/java/Dockerfile-adopt-8-hotspot
+++ b/pterodactyl/base/java/Dockerfile-adopt-8-hotspot
 # ----------------------------------
 # Pterodactyl Core Dockerfile
-# Environment: Java (glibc support)
+# Environment: AdoptOpenJDK-8-Hotspot
 # 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

--- a/pterodactyl/base/java/Dockerfile-adopt-8-openj9
+++ b/pterodactyl/base/java/Dockerfile-adopt-8-openj9
 # ----------------------------------
 # Pterodactyl Core Dockerfile
-# Environment: Java (glibc support)
+# Environment: AdoptOpenJDK-8-OpenJ9
 # 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

--- a/pterodactyl/base/java/Dockerfile-corretto-11
+++ b/pterodactyl/base/java/Dockerfile-corretto-11
+# ----------------------------------
+# Pterodactyl Core Dockerfile
+# Environment: AmazonCorretto-11
+# Minimum Panel Version: 0.6.0
+# ----------------------------------
+FROM amazoncorretto:11-alpine
+
+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"]
--- a/pterodactyl/base/java/Dockerfile-corretto-8
+++ b/pterodactyl/base/java/Dockerfile-corretto-8
+# ----------------------------------
+# Pterodactyl Core Dockerfile
+# Environment: AmazonCorretto-8
+# Minimum Panel Version: 0.6.0
+# ----------------------------------
+FROM amazoncorretto:8-alpine
+
+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"]
--- a/pterodactyl/base/java/Dockerfile-openjdk-11
+++ b/pterodactyl/base/java/Dockerfile-openjdk-11
+# ----------------------------------
+# Pterodactyl Core Dockerfile
+# Environment: OpenJDK-11
+# Minimum Panel Version: 0.6.0
+# ----------------------------------
+FROM openjdk:11-slim
+
+RUN apt update && \
+    apt install -y --no-install-recommends bash && \
+    rm -rf /var/lib/{apt,dpkg,cache,log}/ && \
+    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"]
--- a/pterodactyl/base/java/Dockerfile-openjdk-7
+++ b/pterodactyl/base/java/Dockerfile-openjdk-7
+# ----------------------------------
+# Pterodactyl Core Dockerfile
+# Environment: OpenJDK-7
+# Minimum Panel Version: 0.6.0
+# ----------------------------------
+FROM openjdk:7
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends bash && \
+    rm -rf /var/lib/{apt,dpkg,cache,log}/ && \
+    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"]
--- a/pterodactyl/base/java/Dockerfile-openjdk-8
+++ b/pterodactyl/base/java/Dockerfile-openjdk-8
+# ----------------------------------
+# Pterodactyl Core Dockerfile
+# Environment: OpenJDK-8
+# Minimum Panel Version: 0.6.0
+# ----------------------------------
+FROM openjdk:8-slim
+
+RUN apt update && \
+    apt install -y --no-install-recommends bash && \
+    rm -rf /var/lib/{apt,dpkg,cache,log}/ && \
+    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"]
--- a/pterodactyl/base/java/corretto-11.yml
+++ b/pterodactyl/base/java/corretto-11.yml
+gzzchh/pter-base:corretto-11: ccr.ccs.tencentyun.com/pterodactyl-cn/base:corretto-11
--- a/pterodactyl/base/java/corretto-8.yml
+++ b/pterodactyl/base/java/corretto-8.yml
+gzzchh/pter-base:corretto-8: ccr.ccs.tencentyun.com/pterodactyl-cn/base:corretto-8
--- a/pterodactyl/base/java/openjdk-11.yml
+++ b/pterodactyl/base/java/openjdk-11.yml
+gzzchh/pter-base:openjdk-8: ccr.ccs.tencentyun.com/pterodactyl-cn/base:openjdk-8
--- a/pterodactyl/base/java/openjdk-7.yml
+++ b/pterodactyl/base/java/openjdk-7.yml
+gzzchh/pter-base:openjdk-7: ccr.ccs.tencentyun.com/pterodactyl-cn/base:openjdk-7
--- a/pterodactyl/base/java/openjdk-8.yml
+++ b/pterodactyl/base/java/openjdk-8.yml
+gzzchh/pter-base:openjdk-8: ccr.ccs.tencentyun.com/pterodactyl-cn/base:openjdk-8