From f756a35d39494a4db49b04d8f58cc98aa7faeab0 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Thu, 23 Oct 2025 10:30:37 -0400 Subject: [PATCH 1/2] fix: make sure that docker image has full/correct groonga/pgroonga handling --- Dockerfile-15 | 18 ++++++++++++++++++ Dockerfile-17 | 18 ++++++++++++++++++ Dockerfile-orioledb-17 | 17 +++++++++++++++++ 3 files changed, 53 insertions(+) diff --git a/Dockerfile-15 b/Dockerfile-15 index 3827deffb..a06292674 100644 --- a/Dockerfile-15 +++ b/Dockerfile-15 @@ -122,6 +122,20 @@ RUN nix profile install .#wal-g-3 && \ RUN nix store gc +WORKDIR / +#################### +# setup-groonga +#################### +FROM base as groonga + +WORKDIR /nixpg + +RUN nix profile install .#supabase-groonga && \ + mkdir -p /tmp/groonga-plugins && \ + cp -r /nix/var/nix/profiles/default/lib/groonga/plugins /tmp/groonga-plugins/ + +RUN nix store gc + WORKDIR / # #################### # # Download gosu for easy step-down from root @@ -153,6 +167,7 @@ FROM gosu as production RUN id postgres || (echo "postgres user does not exist" && exit 1) # # Setup extensions COPY --from=walg /tmp/wal-g /usr/local/bin/ +COPY --from=groonga /tmp/groonga-plugins/plugins /usr/lib/groonga/plugins # # Initialise configs COPY --chown=postgres:postgres ansible/files/postgresql_config/postgresql.conf.j2 /etc/postgresql/postgresql.conf @@ -216,4 +231,7 @@ ENV LOCALE_ARCHIVE /usr/lib/locale/locale-archive RUN mkdir -p /usr/share/postgresql/extension/ && \ ln -s /usr/lib/postgresql/bin/pgsodium_getkey.sh /usr/share/postgresql/extension/pgsodium_getkey && \ chmod +x /usr/lib/postgresql/bin/pgsodium_getkey.sh + +ENV GRN_PLUGINS_DIR=/usr/lib/groonga/plugins + CMD ["postgres", "-D", "/etc/postgresql"] diff --git a/Dockerfile-17 b/Dockerfile-17 index 23989c7b9..0bd89256c 100644 --- a/Dockerfile-17 +++ b/Dockerfile-17 @@ -126,6 +126,20 @@ RUN nix profile install .#wal-g-3 && \ RUN nix store gc +WORKDIR / +#################### +# setup-groonga +#################### +FROM base as groonga + +WORKDIR /nixpg + +RUN nix profile install .#supabase-groonga && \ + mkdir -p /tmp/groonga-plugins && \ + cp -r /nix/var/nix/profiles/default/lib/groonga/plugins /tmp/groonga-plugins/ + +RUN nix store gc + WORKDIR / # #################### # # Download gosu for easy step-down from root @@ -157,6 +171,7 @@ FROM gosu as production RUN id postgres || (echo "postgres user does not exist" && exit 1) # # Setup extensions COPY --from=walg /tmp/wal-g /usr/local/bin/ +COPY --from=groonga /tmp/groonga-plugins/plugins /usr/lib/groonga/plugins # # Initialise configs COPY --chown=postgres:postgres ansible/files/postgresql_config/postgresql.conf.j2 /etc/postgresql/postgresql.conf @@ -229,4 +244,7 @@ ENV LOCALE_ARCHIVE /usr/lib/locale/locale-archive RUN mkdir -p /usr/share/postgresql/extension/ && \ ln -s /usr/lib/postgresql/bin/pgsodium_getkey.sh /usr/share/postgresql/extension/pgsodium_getkey && \ chmod +x /usr/lib/postgresql/bin/pgsodium_getkey.sh + +ENV GRN_PLUGINS_DIR=/usr/lib/groonga/plugins + CMD ["postgres", "-D", "/etc/postgresql"] diff --git a/Dockerfile-orioledb-17 b/Dockerfile-orioledb-17 index 1eb9400df..0b4f49d7e 100644 --- a/Dockerfile-orioledb-17 +++ b/Dockerfile-orioledb-17 @@ -126,6 +126,20 @@ RUN nix profile install .#wal-g-3 && \ RUN nix store gc +WORKDIR / +#################### +# setup-groonga +#################### +FROM base as groonga + +WORKDIR /nixpg + +RUN nix profile install .#supabase-groonga && \ + mkdir -p /tmp/groonga-plugins && \ + cp -r /nix/var/nix/profiles/default/lib/groonga/plugins /tmp/groonga-plugins/ + +RUN nix store gc + WORKDIR / # #################### # # Download gosu for easy step-down from root @@ -157,6 +171,7 @@ FROM gosu as production RUN id postgres || (echo "postgres user does not exist" && exit 1) # # Setup extensions COPY --from=walg /tmp/wal-g /usr/local/bin/ +COPY --from=groonga /tmp/groonga-plugins/plugins /usr/lib/groonga/plugins # # Initialise configs COPY --chown=postgres:postgres ansible/files/postgresql_config/postgresql.conf.j2 /etc/postgresql/postgresql.conf @@ -235,4 +250,6 @@ RUN mkdir -p /usr/share/postgresql/extension/ && \ ln -s /usr/lib/postgresql/bin/pgsodium_getkey.sh /usr/share/postgresql/extension/pgsodium_getkey && \ chmod +x /usr/lib/postgresql/bin/pgsodium_getkey.sh +ENV GRN_PLUGINS_DIR=/usr/lib/groonga/plugins + CMD ["postgres", "-D", "/etc/postgresql"] From 826ed08a775cabe575697ef752463cd2f0bf3fa9 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Fri, 24 Oct 2025 14:09:07 -0400 Subject: [PATCH 2/2] chore: bumping release version to release docker images --- ansible/vars.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/vars.yml b/ansible/vars.yml index 7da38b910..a9fc5b34a 100644 --- a/ansible/vars.yml +++ b/ansible/vars.yml @@ -10,9 +10,9 @@ postgres_major: # Full version strings for each major version postgres_release: - postgresorioledb-17: "17.5.1.049-orioledb" - postgres17: "17.6.1.028" - postgres15: "15.14.1.028" + postgresorioledb-17: "17.5.1.050-orioledb" + postgres17: "17.6.1.030" + postgres15: "15.14.1.030" # Non Postgres Extensions pgbouncer_release: 1.19.0