Add symlink for libpq and update loader cache in Dockerfiles

Author: m3hm3t

circleci/images/citusupgradetester/Dockerfile

@@ -78,10 +78,23 @@ apt-get install -y --no-install-recommends --allow-downgrades \
     postgresql-${PG_MAJOR}-dbgsym=${pgdg_version} \
     postgresql-server-dev-${PG_MAJOR}=${pgdg_version} \
 
-# clear apt cache
-rm -rf /var/lib/apt/lists/*
+# --------------------------------------------------------------------
+# libpq lives in /usr/lib/x86_64-linux-gnu, but every PostgreSQL binary
+# looks first in $ORIGIN/../lib (→ /usr/lib/postgresql/${PG_MAJOR}/lib).
+# Drop one symlink there and refresh the loader cache so initdb/psql/etc.
+# can start without LD_LIBRARY_PATH.
+# --------------------------------------------------------------------
+
+    # clear apt cache
+rm -rf /var/lib/apt/lists/* && \
+
+ln -s /usr/lib/x86_64-linux-gnu/libpq.so.5 \
+      /usr/lib/postgresql/${PG_MAJOR}/lib/libpq.so.5 && \
+echo "/usr/lib/x86_64-linux-gnu" > /etc/ld.so.conf.d/libpq.conf && \
+ldconfig
 EOF
 
+
 # add postgress to the path
 ENV PATH=/usr/lib/postgresql/$PG_MAJOR/bin/:$PATH
 

circleci/images/extbuilder/Dockerfile

@@ -67,9 +67,22 @@ apt-get install -y --no-install-recommends --allow-downgrades \
     postgresql-${PG_MAJOR}-dbgsym=${pgdg_version} \
     postgresql-server-dev-${PG_MAJOR}=${pgdg_version}
 
-# clear apt cache
-rm -rf /var/lib/apt/lists/*
+# --------------------------------------------------------------------
+# libpq lives in /usr/lib/x86_64-linux-gnu, but every PostgreSQL binary
+# looks first in $ORIGIN/../lib (→ /usr/lib/postgresql/${PG_MAJOR}/lib).
+# Drop one symlink there and refresh the loader cache so initdb/psql/etc.
+# can start without LD_LIBRARY_PATH.
+# --------------------------------------------------------------------
+
+    # clear apt cache
+rm -rf /var/lib/apt/lists/* && \
+
+ln -s /usr/lib/x86_64-linux-gnu/libpq.so.5 \
+      /usr/lib/postgresql/${PG_MAJOR}/lib/libpq.so.5 && \
+echo "/usr/lib/x86_64-linux-gnu" > /etc/ld.so.conf.d/libpq.conf && \
+ldconfig
 EOF
 
+
 USER circleci
 WORKDIR /home/circleci

circleci/images/exttester/Dockerfile

@@ -174,10 +174,23 @@ apt-get install -y --no-install-recommends --allow-downgrades \
     postgresql-server-dev-${PG_MAJOR}=${pgdg_version} \
     postgresql-${PG_MAJOR}-wal2json \
 
+# --------------------------------------------------------------------
+# libpq lives in /usr/lib/x86_64-linux-gnu, but every PostgreSQL binary
+# looks first in $ORIGIN/../lib (→ /usr/lib/postgresql/${PG_MAJOR}/lib).
+# Drop one symlink there and refresh the loader cache so initdb/psql/etc.
+# can start without LD_LIBRARY_PATH.
+# --------------------------------------------------------------------
+
     # clear apt cache
-rm -rf /var/lib/apt/lists/*
+rm -rf /var/lib/apt/lists/* && \
+
+ln -s /usr/lib/x86_64-linux-gnu/libpq.so.5 \
+      /usr/lib/postgresql/${PG_MAJOR}/lib/libpq.so.5 && \
+echo "/usr/lib/x86_64-linux-gnu" > /etc/ld.so.conf.d/libpq.conf && \
+ldconfig
 EOF
 
+
 # add postgress to the path
 ENV PATH=/usr/lib/postgresql/$PG_MAJOR/bin/:$PATH
 

circleci/images/failtester/Dockerfile

@@ -77,10 +77,23 @@ apt-get install -y --no-install-recommends --allow-downgrades \
     postgresql-${PG_MAJOR}-dbgsym=${pgdg_version} \
     postgresql-server-dev-${PG_MAJOR}=${pgdg_version} \
 
-# clear apt cache
-rm -rf /var/lib/apt/lists/*
+# --------------------------------------------------------------------
+# libpq lives in /usr/lib/x86_64-linux-gnu, but every PostgreSQL binary
+# looks first in $ORIGIN/../lib (→ /usr/lib/postgresql/${PG_MAJOR}/lib).
+# Drop one symlink there and refresh the loader cache so initdb/psql/etc.
+# can start without LD_LIBRARY_PATH.
+# --------------------------------------------------------------------
+
+    # clear apt cache
+rm -rf /var/lib/apt/lists/* && \
+
+ln -s /usr/lib/x86_64-linux-gnu/libpq.so.5 \
+      /usr/lib/postgresql/${PG_MAJOR}/lib/libpq.so.5 && \
+echo "/usr/lib/x86_64-linux-gnu" > /etc/ld.so.conf.d/libpq.conf && \
+ldconfig
 EOF
 
+
 # add postgress to the path
 ENV PATH=/usr/lib/postgresql/$PG_MAJOR/bin/:$PATH