From a05f3e15eba96dd67f67fdde89c52632e0bab432 Mon Sep 17 00:00:00 2001
From: colben <colbenlee@gmail.com>
Date: Wed, 11 Sep 2024 12:17:28 +0800
Subject: [PATCH] update

---
 centos7/centos.sh        | 2 +-
 jdk/{jdk.sh => jdk17.sh} | 7 +++----
 jdk/jdk8.sh              | 2 +-
 mysql/Dockerfile-mysql8  | 5 ++---
 4 files changed, 7 insertions(+), 9 deletions(-)
 rename jdk/{jdk.sh => jdk17.sh} (89%)

diff --git a/centos7/centos.sh b/centos7/centos.sh
index 35ee396..d971a22 100755
--- a/centos7/centos.sh
+++ b/centos7/centos.sh
@@ -9,7 +9,7 @@ export LANG=en_US.UTF-8
 
 [ 'x86_64' == "$(uname -m)" ] && ARCH='' || ARCH="-$(uname -m)"
 ROOT_DIR="$(cd $(dirname $0) && pwd)"
-IMAGE="harbor.colben.cn/general/$(basename ${0%.sh})$ARCH:7"
+IMAGE="harbor.colben.cn/general/centos$ARCH:7"
 
 if [ -t 0 ]; then
     function Print { echo -e "\033[36;1m$(date +'[%F %T]')\033[32;1m $*\033[0m"; }
diff --git a/jdk/jdk.sh b/jdk/jdk17.sh
similarity index 89%
rename from jdk/jdk.sh
rename to jdk/jdk17.sh
index 55f3e1b..2b71f67 100755
--- a/jdk/jdk.sh
+++ b/jdk/jdk17.sh
@@ -9,8 +9,7 @@ export LANG=en_US.UTF-8
 
 [ 'x86_64' == "$(uname -m)" ] && ARCH='' || ARCH="-$(uname -m)"
 ROOT_DIR="$(cd $(dirname $0) && pwd)"
-VERSION="${1%%.*}"
-IMAGE="harbor.colben.cn/general/$(basename ${0%.sh})$ARCH:$VERSION"
+IMAGE="harbor.colben.cn/general/jdk$ARCH:17"
 
 if [ -t 0 ]; then
     function Print { echo -e "\033[36;1m$(date +'[%F %T]')\033[32;1m $*\033[0m"; }
@@ -42,11 +41,11 @@ function YesOrNo {
 }
 
 function Update {
-    Warn Preparing jdk $VERSION ...
+    Warn Preparing jdk 17 ...
     cd $ROOT_DIR
     rm -rf ADD && mkdir ADD
     cd ADD
-    tar zxf $(ls /release/RUNTIME/jdk-$VERSION*_linux${ARCH:--x64}_bin.tar.gz|tail -1)
+    tar zxf /release/RUNTIME/jdk-17_linux${ARCH:--x64}_bin.tar.gz
     mv jdk* jdk
 }
 
diff --git a/jdk/jdk8.sh b/jdk/jdk8.sh
index 24f2af6..25e81dc 100755
--- a/jdk/jdk8.sh
+++ b/jdk/jdk8.sh
@@ -41,7 +41,7 @@ function YesOrNo {
 }
 
 function Update {
-    Warn Preparing jdk 8
+    Warn Preparing jdk 8 ...
     cd $ROOT_DIR
     rm -rf ADD && mkdir ADD
     cd ADD
diff --git a/mysql/Dockerfile-mysql8 b/mysql/Dockerfile-mysql8
index 017111c..3690d3d 100644
--- a/mysql/Dockerfile-mysql8
+++ b/mysql/Dockerfile-mysql8
@@ -9,11 +9,10 @@ name=MySQL 8.0 Community Server\n\
 baseurl=http://repo.mysql.com/yum/mysql-8.0-community/el/8/${arch#-}/\n\
 enabled=1\n\
 gpgcheck=0\n\
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql-2022\n\
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql\n\
 " > /etc/yum.repos.d/mysql-8.0.repo \
                     && dnf makecache \
-                    && dnf install mysql-community-server -y --disablerepo=AppStream \
+                    && dnf -y module disable mysql \
+                    && dnf install mysql-community-server -y \
                     && rm -rf /usr/sbin/mysqld-debug \
                         /var/cache/yum \
                         /var/lib/yum \