From cb1fc6a31084821a56d6389ad246ea33378e3850 Mon Sep 17 00:00:00 2001
From: YZ775 <yuzuki-mimura@cybozu.co.jp>
Date: Mon, 19 Aug 2024 06:15:23 +0000
Subject: [PATCH] add mysql 8.0.39

---
 .github/workflows/ci-e2e.yaml                 |  4 +-
 containers/mysql/8.0.39/.dockerignore         |  1 +
 containers/mysql/8.0.39/Dockerfile            | 40 +++++++++++++++++++
 containers/mysql/8.0.39/TAG                   |  1 +
 .../8.0.39/container-structure-test.yaml      | 15 +++++++
 5 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 containers/mysql/8.0.39/.dockerignore
 create mode 100644 containers/mysql/8.0.39/Dockerfile
 create mode 100644 containers/mysql/8.0.39/TAG
 create mode 100644 containers/mysql/8.0.39/container-structure-test.yaml

diff --git a/.github/workflows/ci-e2e.yaml b/.github/workflows/ci-e2e.yaml
index 53e32b0d3..f5bbe647c 100644
--- a/.github/workflows/ci-e2e.yaml
+++ b/.github/workflows/ci-e2e.yaml
@@ -20,7 +20,7 @@ jobs:
     name: Integration tests with MySQL
     strategy:
       matrix:
-        mysql-version: ["8.0.28", "8.0.36", "8.0.37", "8.4.0"]
+        mysql-version: ["8.0.28", "8.0.37", "8.0.39", "8.4.0"]
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
@@ -63,7 +63,7 @@ jobs:
     name: Supported MySQL versions End-to-End Tests
     strategy:
       matrix:
-        mysql-version: ["8.0.28", "8.0.36", "8.0.37", "8.4.0"]
+        mysql-version: ["8.0.28", "8.0.37", "8.0.39", "8.4.0"]
         k8s-version: ["1.29.4"]
     runs-on:
       group: moco
diff --git a/containers/mysql/8.0.39/.dockerignore b/containers/mysql/8.0.39/.dockerignore
new file mode 100644
index 000000000..72e8ffc0d
--- /dev/null
+++ b/containers/mysql/8.0.39/.dockerignore
@@ -0,0 +1 @@
+*
diff --git a/containers/mysql/8.0.39/Dockerfile b/containers/mysql/8.0.39/Dockerfile
new file mode 100644
index 000000000..8f851254f
--- /dev/null
+++ b/containers/mysql/8.0.39/Dockerfile
@@ -0,0 +1,40 @@
+FROM ghcr.io/cybozu/ubuntu-dev:22.04 AS builder
+
+ARG MYSQL_VERSION=8.0.39
+
+RUN apt-get update && apt-get -y install --no-install-recommends \
+    cmake \
+    libncurses5-dev \
+    libjemalloc-dev \
+    libnuma-dev \
+    libaio-dev \
+    pkg-config
+
+RUN cd tmp/ \
+    && curl -fsSL -O https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-${MYSQL_VERSION}.tar.gz \
+    && tar -x -z -f mysql-boost-${MYSQL_VERSION}.tar.gz \
+    && cd mysql-${MYSQL_VERSION} \
+    && mkdir bld \
+    && cd bld \
+    && cmake .. -DBUILD_CONFIG=mysql_release -DCMAKE_BUILD_TYPE=Release -DWITH_BOOST=$(ls -d ../boost/boost_*) -DWITH_NUMA=1 -DWITH_JEMALLOC=1 -DWITH_PACKAGE_FLAGS=0 \
+    && make -j 20 \
+    && make install
+
+FROM ghcr.io/cybozu/ubuntu:22.04
+
+COPY --from=builder /usr/local/mysql/LICENSE /usr/local/mysql/LICENSE
+COPY --from=builder /usr/local/mysql/bin /usr/local/mysql/bin
+COPY --from=builder /usr/local/mysql/lib /usr/local/mysql/lib
+COPY --from=builder /usr/local/mysql/share /usr/local/mysql/share
+
+RUN apt-get update \
+  && apt-get install -y --no-install-recommends libjemalloc2 libnuma1 libaio1 \
+  && rm -rf /var/lib/apt/lists/* \
+  && mkdir -p /var/lib/mysql \
+  && chown -R 10000:10000 /var/lib/mysql
+
+ENV PATH=/usr/local/mysql/bin:"$PATH"
+VOLUME /var/lib/mysql
+ENTRYPOINT ["mysqld"]
+EXPOSE 3306 33060 33062 8080
+USER 10000:10000
diff --git a/containers/mysql/8.0.39/TAG b/containers/mysql/8.0.39/TAG
new file mode 100644
index 000000000..3433de8f9
--- /dev/null
+++ b/containers/mysql/8.0.39/TAG
@@ -0,0 +1 @@
+8.0.39.1
diff --git a/containers/mysql/8.0.39/container-structure-test.yaml b/containers/mysql/8.0.39/container-structure-test.yaml
new file mode 100644
index 000000000..b13360964
--- /dev/null
+++ b/containers/mysql/8.0.39/container-structure-test.yaml
@@ -0,0 +1,15 @@
+schemaVersion: '2.0.0'
+fileExistenceTests:
+- name: 'mysqld'
+  path: '/usr/local/mysql/bin/mysqld'
+  shouldExist: true
+  isExecutableBy: 'owner'
+- name: 'mysql lib'
+  path: '/usr/local/mysql/lib'
+  shouldExist: true
+- name: 'mysql share'
+  path: '/usr/local/mysql/share'
+  shouldExist: true
+- name: 'mysql LICENSE'
+  path: '/usr/local/mysql/LICENSE'
+  shouldExist: true