diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f63e11..e1e5cfc 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 0.2.63 - 2025-10-09 +- Upgrade the base image to AlmaLinux 10.0 +- SingleStoreDB Toolbox Version 1.18.6 +- SingleStoreDB Studio Version 4.1.1 +- SingleStoreDB Client Version 1.0.8 + ## 0.2.62 - 2025-10-03 - SingleStoreDB Version 9.0.9 diff --git a/Dockerfile b/Dockerfile index 2965723..cc4248f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,15 @@ ARG KAI_VERSION # Since KAI_VERSION is used for a FROM later; must be declared before first FROM (of any image) FROM gcr.io/singlestore-public/internal-mongoproxy:v$KAI_VERSION AS kai -FROM almalinux:8.6-20220901 AS base +FROM almalinux:10.0-20250825 AS base -ARG SECURITY_UPDATES_AS_OF=2022-09-30 - -RUN rpm --import https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux +RUN rpm --import https://repo.almalinux.org/almalinux/10/BaseOS/x86_64/os/RPM-GPG-KEY-AlmaLinux-10 RUN dnf upgrade -y almalinux-release && \ yum -y clean all RUN yum makecache --refresh && \ - yum install -y yum-utils wget procps java-11-openjdk && \ + yum install -y yum-utils wget procps gpg && \ yum update -y curl && \ yum-config-manager --save --setopt=skip_missing_names_on_install=0 && \ yum -y update-minimal --setopt=tsflags=nodocs --nobest --security --sec-severity=Important --sec-severity=Critical && \ @@ -52,6 +50,9 @@ ADD scripts/mongosh /usr/local/bin/mongosh ADD scripts/mongosh-auth /usr/local/bin/mongosh-auth ADD scripts/singlestore-auth /usr/local/bin/singlestore-auth +ADD scripts/setup-singlestore-user.sh /scripts/setup-singlestore-user.sh +RUN /scripts/setup-singlestore-user.sh + RUN yum-config-manager --add-repo https://release.memsql.com/$(echo "${CONFIG}" | jq -r .channel)/rpm/x86_64/repodata/memsql.repo && \ yum install -y \ singlestore-client-$(echo "${CONFIG}" | jq -r .client) \ @@ -59,9 +60,6 @@ RUN yum-config-manager --add-repo https://release.memsql.com/$(echo "${CONFIG}" singlestoredb-studio-$(echo "${CONFIG}" | jq -r .studio) && \ yum clean all -ADD scripts/setup-singlestore-user.sh /scripts/setup-singlestore-user.sh -RUN /scripts/setup-singlestore-user.sh - RUN mkdir -p /server && chown -R singlestore:singlestore /server RUN mkdir -p /data && chown -R singlestore:singlestore /data RUN mkdir -p /logs && chown -R singlestore:singlestore /logs diff --git a/config.json b/config.json index ef8a521..a61c7be 100755 --- a/config.json +++ b/config.json @@ -1,9 +1,9 @@ { "channel": "production", - "client": "1.0.7", + "client": "1.0.8", "engine_channel": "production", "kai": "1.0.102", "server": "9.0.9-c567fcf798", - "studio": "4.0.14", - "toolbox": "1.18.5" + "studio": "4.1.1", + "toolbox": "1.18.6" } \ No newline at end of file diff --git a/scripts/init.sh b/scripts/init.sh index 87c3b45..2fdb60e 100755 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -46,6 +46,8 @@ sdb-admin -y update-config --all --set-global --key enable_external_functions -- sdb-admin -y update-config --all --set-global --key http_api --value on sdb-admin -y update-config --all --set-global --key fts2_java_path --value /usr/local/jdk-21/bin/java sdb-admin -y update-config --all --set-global --key fts2_java_home --value /usr/local/jdk-21 +sdb-admin -y update-config --all --set-global --key java_pipelines_java_path --value /usr/local/jdk-21/bin/java +sdb-admin -y update-config --all --set-global --key java_pipelines_java11_path --value /usr/local/jdk-21/bin/java isEngineVersionGE() { diff --git a/scripts/setup-singlestore-user.sh b/scripts/setup-singlestore-user.sh index 57d04d9..187b834 100755 --- a/scripts/setup-singlestore-user.sh +++ b/scripts/setup-singlestore-user.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # use pipefail so that the return value of pipeline commands is not just the right most return value -set -uo pipefail +set -uxo pipefail # the singlestore user should be 999, change any user that was 999 to something different # in alma this is currently systemd-coredump