Skip to content

fix: make sure that docker image has full/correct groonga/pgroonga handling #1858

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.

Sign up for GitHub

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

Closed
samrose wants to merge 2 commits into from
Closed

fix: make sure that docker image has full/correct groonga/pgroonga handling #1858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f756a35
fix: make sure that docker image has full/correct groonga/pgroonga ha…
samrose Oct 23, 2025
826ed08
chore: bumping release version to release docker images
samrose Oct 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions Dockerfile-15
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"]
18 changes: 18 additions & 0 deletions Dockerfile-17
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"]
17 changes: 17 additions & 0 deletions Dockerfile-orioledb-17
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"]
6 changes: 3 additions & 3 deletions ansible/vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down