Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Get MySQL, Mroonga, and Groonga versions automatically in update.sh #98

Merged
merged 12 commits into from
Jan 30, 2025

Conversation

komainu8
Copy link
Member

Usage: ./update.sh

The result of execution of ./update.sh as below.

Date:   Thu Jan 30 11:29:55 2025 +0900

    MySQL 8.0.41 and Mroonga 14.13

diff --git a/README.md b/README.md
index 7c5ad8d..2397169 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,8 @@ Currently, groonga/mroonga provides these couples of versions.
 
 | tag                    | MySQL  | Mroonga | Groonga |
 |------------------------|--------|---------|---------|
-| mysql-8.0-latest       | 8.0.40 | 14.12   | 14.1.2  |
+| mysql-8.0-latest       | 8.0.41 | 14.13   | 14.1.3  |
+| mysql-8.0.41-14.13     | 8.0.41 | 14.13   | 14.1.3  |
 | mysql-8.0.40-14.12     | 8.0.40 | 14.12   | 14.1.2  |
 | mysql-8.0.30-12.06     | 8.0.30 | 12.06   | 12.0.6  |
 | mysql-8.0.29-12.04     | 8.0.29 | 12.04   | 12.0.4  |
diff --git a/mysql-8.0/Dockerfile b/mysql-8.0/Dockerfile
index ed6b805..e7fbbec 100644
--- a/mysql-8.0/Dockerfile
+++ b/mysql-8.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM mysql:8.0.40-oraclelinux9
+FROM mysql:8.0.41-oraclelinux9
 
 # TODO
 # Remove `--setopt=apache-arrow-almalinux.gpgcheck=0` option.
@@ -8,8 +8,8 @@ FROM mysql:8.0.40-oraclelinux9
 # error: failed to parse public key for /var/cache/yum/metadata/apache-arrow-almalinux-9-x86_64/RPM-GPG-KEY-Apache-Arrow
 # ```
 
-ENV groonga_version=14.1.2 \
-    mroonga_version=14.12
+ENV groonga_version=14.1.3 \
+    mroonga_version=14.13
 
 RUN mkdir -p /etc/mysql/mysql.conf.d && \
     touch /etc/mysql/mysql.conf.d/default-auth-override.cnf && \
@@ -33,6 +33,6 @@ RUN mkdir -p /docker-entrypoint-mroonga-initdb.d && \
       -e 's,docker_process_init_files /,docker_process_init_files /docker-entrypoint-mroonga-initdb.d/* /,g' \
       /usr/local/bin/docker-entrypoint.sh
 
-# mysql:8.0.40 image has DB in /var/lib/mysql/.
+# mysql:8.0.41 image has DB in /var/lib/mysql/.
 # This clears /var/lib/mysql/ to ensure creating a new DB on "docker run".
 VOLUME ["/var/lib/mysql"]

update.sh Outdated
if [ $# != 3 ]; then
echo "Usage: $0 MYSQL_VERSION MROONGA_VERSION GROONGA_VERSION"
echo " e.g.: $0 8.0.30 12.06 12.0.6"
if [ $# != 0 ]; then
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

引数を受け取らない場合は、ここのチェックはなくても良さそうかなと思いました。

mysql_version=$1
mroonga_version=$2
groonga_version=$3
target_mysqls=(
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
target_mysqls=(
target_mysql_versions=(

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry this is right. Please ignore my comment.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh...

update.sh Outdated
8.0)
mysql_version=$(curl https://raw.githubusercontent.com/docker-library/mysql/refs/heads/master/versions.json \
| jq -r '.["8.0"]["version"]')
docker_file=mysql-8.0/Dockerfile
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We might write this line outside the case block.

update.sh Outdated

tag="mysql-${mysql_version}-${mroonga_version}"
message="MySQL ${mysql_version} and Mroonga ${mroonga_version}"
echo "${message}"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this debug command? If so, we could delete it.

Copy link
Member

@kou kou left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you update README.md too?

@komainu8
Copy link
Member Author

Could you update README.md too?

I updated it.

Copy link

@otegami otegami left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍🏾

@kou kou merged commit 640ea1c into mroonga:master Jan 30, 2025
2 checks passed
@komainu8 komainu8 deleted the get-version-automatically-in-update_sh branch January 30, 2025 06:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants