Skip to content

Commit a33f57e

Browse files
author
Ariel Rolfo
committed
fix pg17 bins
1 parent 4990b59 commit a33f57e

2 files changed

Lines changed: 11 additions & 1 deletion

File tree

Dockerfile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ COPY openssl.cnf /runtime/etc/pki/tls/openssl.cnf
122122
# Auto-collect shared library dependencies for Ruby, native gems, and psql
123123
RUN set -eux; \
124124
mkdir -p /runtime/usr/lib64; \
125-
targets="/usr/local/bin/ruby /usr/bin/psql /usr/bin/pg_dump /usr/bin/pg_restore"; \
125+
targets="/usr/local/bin/ruby /usr/bin/psql /usr/bin/pg_dump /usr/bin/pg_restore /usr/pgsql-17/bin/psql /usr/pgsql-17/bin/pg_dump /usr/pgsql-17/bin/pg_restore"; \
126126
if [ -d "$APP_PATH/vendor/bundle" ]; then \
127127
sofiles=$(find "$APP_PATH/vendor/bundle" -type f -name "*.so" || true); \
128128
targets="$targets $sofiles"; \
@@ -177,6 +177,13 @@ RUN set -eux; \
177177
mkdir -p /runtime/usr/share && cp -a /usr/share/zoneinfo /runtime/usr/share/zoneinfo; \
178178
chmod +x /tmp/docker-entrypoint.sh; cp /tmp/docker-entrypoint.sh /runtime/usr/bin/docker-entrypoint.sh
179179

180+
# Ensure PostgreSQL 17 client binaries present in runtime PATH
181+
RUN set -eux; \
182+
mkdir -p /runtime/usr/bin; \
183+
for b in /usr/pgsql-17/bin/psql /usr/pgsql-17/bin/pg_dump /usr/pgsql-17/bin/pg_restore; do \
184+
if [ -x "$b" ]; then cp -a "$b" /runtime/usr/bin/; fi; \
185+
done
186+
180187
# Runtime stage (UBI 10 micro)
181188
FROM registry.access.redhat.com/ubi10/ubi-micro:10.0-1754556444
182189

terraform/environments/eks/k8s-manifests-staging/app-deployment.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ spec:
2424
- name: db-migrate
2525
image: 996810415034.dkr.ecr.us-east-1.amazonaws.com/eks-ce-registry:eks-infrastructure
2626
imagePullPolicy: Always
27+
env:
28+
- name: PATH
29+
value: "/usr/bin:/usr/local/bin:/usr/sbin:/sbin:/bin"
2730
command: ["/bin/bash","-lc"]
2831
args:
2932
- bundle exec rake db:migrate RACK_ENV=production

0 commit comments

Comments
 (0)