From 3d11822710789e82f64f08c578162a5b804d2f2f Mon Sep 17 00:00:00 2001
From: Jesper Noordsij <jesper@sslleiden.nl>
Date: Tue, 2 Jul 2024 11:20:08 +0200
Subject: [PATCH] Use Oracle Linux 9 as base image for innovation image

---
 innovation/Dockerfile.oracle | 10 +++++-----
 versions.json                | 26 +++++++++++++-------------
 versions.sh                  |  2 +-
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/innovation/Dockerfile.oracle b/innovation/Dockerfile.oracle
index c0908a5d4..7752a90db 100644
--- a/innovation/Dockerfile.oracle
+++ b/innovation/Dockerfile.oracle
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM oraclelinux:8-slim
+FROM oraclelinux:9-slim
 
 RUN set -eux; \
 	groupadd --system --gid 999 mysql; \
@@ -56,14 +56,14 @@ RUN set -eux; \
 	rm -rf "$GNUPGHOME"
 
 ENV MYSQL_MAJOR innovation
-ENV MYSQL_VERSION 8.4.0-1.el8
+ENV MYSQL_VERSION 9.0.0-1.el9
 
 RUN set -eu; \
 	{ \
 		echo '[mysqlinnovation-server-minimal]'; \
 		echo 'name=MySQL innovation Server Minimal'; \
 		echo 'enabled=1'; \
-		echo 'baseurl=https://repo.mysql.com/yum/mysql-innovation-community/docker/el/8/$basearch/'; \
+		echo 'baseurl=https://repo.mysql.com/yum/mysql-innovation-community/docker/el/9/$basearch/'; \
 		echo 'gpgcheck=1'; \
 		echo 'gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql'; \
 # https://github.com/docker-library/mysql/pull/680#issuecomment-825930524
@@ -100,14 +100,14 @@ RUN set -eu; \
 	{ \
 		echo '[mysql-tools-community]'; \
 		echo 'name=MySQL Tools Community'; \
-		echo 'baseurl=https://repo.mysql.com/yum/mysql-tools-innovation-community/el/8/$basearch/'; \
+		echo 'baseurl=https://repo.mysql.com/yum/mysql-tools-innovation-community/el/9/$basearch/'; \
 		echo 'enabled=1'; \
 		echo 'gpgcheck=1'; \
 		echo 'gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-mysql'; \
 # https://github.com/docker-library/mysql/pull/680#issuecomment-825930524
 		echo 'module_hotfixes=true'; \
 	} | tee /etc/yum.repos.d/mysql-community-tools.repo
-ENV MYSQL_SHELL_VERSION 9.0.0-1.el8
+ENV MYSQL_SHELL_VERSION 9.0.0-1.el9
 RUN set -eux; \
 	microdnf install -y "mysql-shell-$MYSQL_SHELL_VERSION"; \
 	microdnf clean all; \
diff --git a/versions.json b/versions.json
index 9397d2a06..1cd5bc386 100644
--- a/versions.json
+++ b/versions.json
@@ -1,35 +1,35 @@
 {
-  "8.4": {
+  "innovation": {
     "oracle": {
       "architectures": [
         "amd64",
         "arm64v8"
       ],
-      "repo": "https://repo.mysql.com/yum/mysql-8.4-community/docker/el/9",
-      "version": "8.4.1-1.el9",
+      "repo": "https://repo.mysql.com/yum/mysql-innovation-community/docker/el/9",
+      "version": "9.0.0-1.el9",
       "variant": "9-slim"
     },
     "mysql-shell": {
-      "repo": "https://repo.mysql.com/yum/mysql-tools-8.4-community/el/9",
-      "version": "8.4.1-1.el9"
+      "repo": "https://repo.mysql.com/yum/mysql-tools-innovation-community/el/9",
+      "version": "9.0.0-1.el9"
     },
-    "version": "8.4.1"
+    "version": "9.0.0"
   },
-  "innovation": {
+  "8.4": {
     "oracle": {
       "architectures": [
         "amd64",
         "arm64v8"
       ],
-      "repo": "https://repo.mysql.com/yum/mysql-innovation-community/docker/el/8",
-      "version": "8.4.0-1.el8",
-      "variant": "8-slim"
+      "repo": "https://repo.mysql.com/yum/mysql-8.4-community/docker/el/9",
+      "version": "8.4.1-1.el9",
+      "variant": "9-slim"
     },
     "mysql-shell": {
-      "repo": "https://repo.mysql.com/yum/mysql-tools-innovation-community/el/8",
-      "version": "9.0.0-1.el8"
+      "repo": "https://repo.mysql.com/yum/mysql-tools-8.4-community/el/9",
+      "version": "8.4.1-1.el9"
     },
-    "version": "8.4.0"
+    "version": "8.4.1"
   },
   "8.0": {
     "version": "8.0.38",
diff --git a/versions.sh b/versions.sh
index 3b0823e97..b3632f69f 100755
--- a/versions.sh
+++ b/versions.sh
@@ -8,7 +8,7 @@ declare -A debianSuites=(
 
 defaultOracleVariant='9-slim'
 declare -A oracleVariants=(
-	[innovation]='8-slim'
+	#[innovation]='8-slim'
 )
 
 # https://repo.mysql.com/yum/mysql-8.0-community/docker/