Skip to content

Commit 949715d

Browse files
authored
fix(docker): move template out of mount point (#2095)
1 parent 237fb2b commit 949715d

2 files changed

Lines changed: 9 additions & 7 deletions

File tree

Dockerfile-multigres

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,11 +191,12 @@ RUN for f in /nix/var/nix/profiles/default/bin/*; do \
191191
RUN chown -R postgres:postgres /usr/lib/postgresql && \
192192
chown -R postgres:postgres /usr/share/postgresql
193193

194-
COPY docker/pgctld/postgresql.conf.tmpl /etc/pgctld/postgresql.conf.tmpl
194+
# Can't use /etc/pgctld because it's a mount point
195+
COPY docker/pgctld/postgresql.conf.tmpl /etc/pgctld-custom/postgresql.conf.tmpl
195196

196197
# Wrapper: injects --postgres-config-template on every pgctld call so the team's
197198
# unmodified k8s manifests and local provisioner commands work without extra flags.
198-
RUN printf '#!/bin/sh\nexec /nix/var/nix/profiles/default/bin/pgctld --postgres-config-template /etc/pgctld/postgresql.conf.tmpl "$@"\n' \
199+
RUN printf '#!/bin/sh\nexec /nix/var/nix/profiles/default/bin/pgctld --postgres-config-template /etc/pgctld-custom/postgresql.conf.tmpl "$@"\n' \
199200
> /usr/local/bin/pgctld && \
200201
chmod +x /usr/local/bin/pgctld
201202

@@ -257,11 +258,12 @@ ENV LANG=C
257258
ENV LC_ALL=C
258259
ENV LANGUAGE=C
259260

260-
COPY docker/pgctld/orioledb-postgresql.conf.tmpl /etc/pgctld/orioledb-postgresql.conf.tmpl
261+
# Can't use /etc/pgctld because it's a mount point
262+
COPY docker/pgctld/orioledb-postgresql.conf.tmpl /etc/pgctld-custom/orioledb-postgresql.conf.tmpl
261263

262264
# Wrapper: injects --postgres-config-template on every pgctld call so the team's
263265
# unmodified k8s manifests and local provisioner commands work without extra flags.
264-
RUN printf '#!/bin/sh\nexec /nix/var/nix/profiles/default/bin/pgctld --postgres-config-template /etc/pgctld/orioledb-postgresql.conf.tmpl "$@"\n' \
266+
RUN printf '#!/bin/sh\nexec /nix/var/nix/profiles/default/bin/pgctld --postgres-config-template /etc/pgctld-custom/orioledb-postgresql.conf.tmpl "$@"\n' \
265267
> /usr/local/bin/pgctld && \
266268
chmod +x /usr/local/bin/pgctld
267269

ansible/vars.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ postgres_major:
1010

1111
# Full version strings for each major version
1212
postgres_release:
13-
postgresorioledb-17: "17.6.0.059-orioledb"
14-
postgres17: "17.6.1.102"
15-
postgres15: "15.14.1.102"
13+
postgresorioledb-17: "17.6.0.060-orioledb"
14+
postgres17: "17.6.1.103"
15+
postgres15: "15.14.1.103"
1616

1717
# Non Postgres Extensions
1818
pgbouncer_release: 1.25.1

0 commit comments

Comments
 (0)