From f5d6ff50df511301ffdcf7f72a0951e02567dc85 Mon Sep 17 00:00:00 2001 From: Yuuki <6851027-yukiz@users.noreply.gitlab.com> Date: Mon, 7 Oct 2024 15:20:48 +0800 Subject: [PATCH] Update a9f7037 with java 22 --- gs/entrypoint_gc.sh | 2 +- gs/os-loc-alpine-gc | 2 +- gs/os-loc-ubuntu-gc | 2 +- gs/os-ubuntu-gc | 2 +- gs/os-ubuntu-gc-action | 2 +- gs/ver_GSServer-GC-5.0 | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gs/entrypoint_gc.sh b/gs/entrypoint_gc.sh index 7e3d879fbc..6511f55d2d 100644 --- a/gs/entrypoint_gc.sh +++ b/gs/entrypoint_gc.sh @@ -168,7 +168,7 @@ elif echo "$version" | grep -F -w "4.7"; then version_res="4.7" # resmd5="" elif echo "$version" | grep -F -w "5.0"; then - version_res="4.7" + version_res="5.0" # resmd5="" fi diff --git a/gs/os-loc-alpine-gc b/gs/os-loc-alpine-gc index 348b3765a5..3fba7bf6bb 100644 --- a/gs/os-loc-alpine-gc +++ b/gs/os-loc-alpine-gc @@ -1,4 +1,4 @@ -FROM eclipse-temurin:17-jdk-alpine +FROM eclipse-temurin:22-jdk-alpine RUN \ # Install json utilities for config.json, TODO: remove git after zip function in gc finished and nodejs, procps used for ps monitors apk add --no-cache nodejs git curl procps &&\ diff --git a/gs/os-loc-ubuntu-gc b/gs/os-loc-ubuntu-gc index 4171ca1c0e..53e748e8c7 100644 --- a/gs/os-loc-ubuntu-gc +++ b/gs/os-loc-ubuntu-gc @@ -1,4 +1,4 @@ -FROM eclipse-temurin:17-jdk +FROM eclipse-temurin:22-jdk RUN \ apt-get update && apt-get -y install git curl nodejs &&\ # Install json utilities for config.json diff --git a/gs/os-ubuntu-gc b/gs/os-ubuntu-gc index e60746ec3b..4097576e86 100644 --- a/gs/os-ubuntu-gc +++ b/gs/os-ubuntu-gc @@ -1,4 +1,4 @@ -FROM eclipse-temurin:17-jdk as build +FROM eclipse-temurin:22-jdk as build WORKDIR /work diff --git a/gs/os-ubuntu-gc-action b/gs/os-ubuntu-gc-action index 59ebbac6f6..3eb289051b 100644 --- a/gs/os-ubuntu-gc-action +++ b/gs/os-ubuntu-gc-action @@ -1,4 +1,4 @@ -FROM eclipse-temurin:17-jdk as build +FROM eclipse-temurin:22-jdk as build WORKDIR /work diff --git a/gs/ver_GSServer-GC-5.0 b/gs/ver_GSServer-GC-5.0 index 88a8881353..e9f4a0a16e 100644 --- a/gs/ver_GSServer-GC-5.0 +++ b/gs/ver_GSServer-GC-5.0 @@ -1 +1 @@ -3562d4a \ No newline at end of file +a9f7037 \ No newline at end of file