Skip to content

Commit aa7482a

Browse files
committed
Update PostgreSQL versions and remove symlink commands from Dockerfiles
1 parent b0e4c6e commit aa7482a

5 files changed

Lines changed: 3 additions & 34 deletions

File tree

circleci/images/PG_VERSIONS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
PG15=15.12
2-
PG16=16.8
3-
PG17=17.4
1+
PG15=15.13
2+
PG16=16.9
3+
PG17=17.5
44
PG18=18~beta1

circleci/images/citusupgradetester/Dockerfile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,6 @@ apt-get install -y --no-install-recommends --allow-downgrades \
8282
rm -rf /var/lib/apt/lists/*
8383
EOF
8484

85-
# now do the symlink (outside the heredoc!) in its own layer
86-
RUN ln -s /usr/lib/x86_64-linux-gnu/libpq.so.5 \
87-
/usr/lib/postgresql/${PG_MAJOR}/lib/libpq.so.5 && \
88-
echo "/usr/lib/x86_64-linux-gnu" > /etc/ld.so.conf.d/libpq.conf && \
89-
ldconfig
90-
9185
# add postgress to the path
9286
ENV PATH=/usr/lib/postgresql/$PG_MAJOR/bin/:$PATH
9387

circleci/images/extbuilder/Dockerfile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,5 @@ apt-get install -y --no-install-recommends --allow-downgrades \
7171
rm -rf /var/lib/apt/lists/*
7272
EOF
7373

74-
# now do the symlink (outside the heredoc!) in its own layer
75-
RUN ln -s /usr/lib/x86_64-linux-gnu/libpq.so.5 \
76-
/usr/lib/postgresql/${PG_MAJOR}/lib/libpq.so.5 && \
77-
echo "/usr/lib/x86_64-linux-gnu" > /etc/ld.so.conf.d/libpq.conf && \
78-
ldconfig
79-
8074
USER circleci
8175
WORKDIR /home/circleci

circleci/images/exttester/Dockerfile

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -178,19 +178,6 @@ apt-get install -y --no-install-recommends --allow-downgrades \
178178
rm -rf /var/lib/apt/lists/*
179179
EOF
180180

181-
# ---------- copy helper binaries ----------
182-
COPY --from=dev-tools-collection /collect/ /
183-
184-
# now do the symlink (outside the heredoc!) in its own layer
185-
RUN apt-get update && \
186-
apt-get install -y --no-install-recommends --reinstall libpq5 && \
187-
rm -rf /var/lib/apt/lists/* && \
188-
# 4. satisfy RUNPATH
189-
ln -sf /usr/lib/x86_64-linux-gnu/libpq.so.5 \
190-
/usr/lib/postgresql/${PG_MAJOR}/lib/libpq.so.5 && \
191-
echo "/usr/lib/x86_64-linux-gnu" > /etc/ld.so.conf.d/libpq.conf && \
192-
ldconfig
193-
ENV LD_PRELOAD="/usr/lib/x86_64-linux-gnu/libpq.so.5"
194181

195182
# add postgress to the path
196183
ENV PATH=/usr/lib/postgresql/$PG_MAJOR/bin/:$PATH

circleci/images/failtester/Dockerfile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,6 @@ apt-get install -y --no-install-recommends --allow-downgrades \
8181
rm -rf /var/lib/apt/lists/*
8282
EOF
8383

84-
# now do the symlink (outside the heredoc!) in its own layer
85-
RUN ln -s /usr/lib/x86_64-linux-gnu/libpq.so.5 \
86-
/usr/lib/postgresql/${PG_MAJOR}/lib/libpq.so.5 && \
87-
echo "/usr/lib/x86_64-linux-gnu" > /etc/ld.so.conf.d/libpq.conf && \
88-
ldconfig
89-
9084
# add postgress to the path
9185
ENV PATH=/usr/lib/postgresql/$PG_MAJOR/bin/:$PATH
9286

0 commit comments

Comments
 (0)