Skip to content

Commit 97620df

Browse files
committed
Remove libpq5 from multiple Dockerfiles and update installation to use specific version
1 parent c26fa4f commit 97620df

5 files changed

Lines changed: 4 additions & 10 deletions

File tree

circleci/images/citusupgradetester/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ apt-get install -y --no-install-recommends \
2323
lcov \
2424
libcurl4 \
2525
libcurl4-openssl-dev \
26-
libpq5 \
2726
libicu-dev \
2827
liblz4-1 \
2928
liblz4-dev \
@@ -72,8 +71,8 @@ apt-get update
7271
pgdg_version=$(apt list -a postgresql-server-dev-${PG_MAJOR} 2>/dev/null | grep "${PG_VERSION}" | awk '{print $2}' | head -n1 )
7372

7473
apt-get install -y --no-install-recommends --allow-downgrades \
74+
libpq5=${pgdg_version} \
7575
libpq-dev=${pgdg_version} \
76-
# libpq5=${pgdg_version} \
7776
postgresql-${PG_MAJOR}=${pgdg_version} \
7877
postgresql-client-${PG_MAJOR}=${pgdg_version} \
7978
postgresql-${PG_MAJOR}-dbgsym=${pgdg_version} \

circleci/images/extbuilder/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ apt-get install -y --no-install-recommends \
2020
gosu \
2121
libcurl4 \
2222
libcurl4-openssl-dev \
23-
libpq5 \
2423
libicu-dev \
2524
liblz4-1 \
2625
liblz4-dev \
@@ -61,8 +60,8 @@ apt-get update
6160
pgdg_version=$(apt list -a postgresql-server-dev-${PG_MAJOR} 2>/dev/null | grep "${PG_VERSION}" | awk '{print $2}' | head -n1 )
6261

6362
apt-get install -y --no-install-recommends --allow-downgrades \
63+
libpq5=${pgdg_version}
6464
libpq-dev=${pgdg_version} \
65-
# libpq5=${pgdg_version} \
6665
postgresql-${PG_MAJOR}=${pgdg_version} \
6766
postgresql-client-${PG_MAJOR}=${pgdg_version} \
6867
postgresql-${PG_MAJOR}-dbgsym=${pgdg_version} \

circleci/images/exttester/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ apt-get install -y --no-install-recommends \
2020
gosu \
2121
libcurl4 \
2222
libcurl4-openssl-dev \
23-
libpq5 \
2423
libicu-dev \
2524
liblz4-1 \
2625
liblz4-dev \
@@ -111,7 +110,6 @@ apt-get install -y --no-install-recommends \
111110
lcov \
112111
libcurl4 \
113112
libcurl4-openssl-dev \
114-
libpq5 \
115113
libicu-dev \
116114
liblz4-1 \
117115
liblz4-dev \
@@ -168,8 +166,8 @@ apt-get update
168166
pgdg_version=$(apt list -a postgresql-server-dev-${PG_MAJOR} 2>/dev/null | grep "${PG_VERSION}" | awk '{print $2}' | head -n1 )
169167

170168
apt-get install -y --no-install-recommends --allow-downgrades \
169+
libpq5=${pgdg_version} \
171170
libpq-dev=${pgdg_version} \
172-
# libpq5=${pgdg_version} \
173171
postgresql-${PG_MAJOR}=${pgdg_version} \
174172
postgresql-client-${PG_MAJOR}=${pgdg_version} \
175173
postgresql-${PG_MAJOR}-dbgsym=${pgdg_version} \

circleci/images/failtester/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ apt-get install -y --no-install-recommends \
2222
lcov \
2323
libcurl4 \
2424
libcurl4-openssl-dev \
25-
libpq5 \
2625
libicu-dev \
2726
liblz4-1 \
2827
liblz4-dev \
@@ -71,8 +70,8 @@ apt-get update
7170
pgdg_version=$(apt list -a postgresql-server-dev-${PG_MAJOR} 2>/dev/null | grep "${PG_VERSION}" | awk '{print $2}' | head -n1 )
7271

7372
apt-get install -y --no-install-recommends --allow-downgrades \
73+
libpq5=${pgdg_version} \
7474
libpq-dev=${pgdg_version} \
75-
# libpq5=${pgdg_version} \
7675
postgresql-${PG_MAJOR}=${pgdg_version} \
7776
postgresql-client-${PG_MAJOR}=${pgdg_version} \
7877
postgresql-${PG_MAJOR}-dbgsym=${pgdg_version} \

circleci/images/pgupgradetester/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ apt-get install -y --no-install-recommends \
2424
lcov \
2525
libcurl4 \
2626
libcurl4-openssl-dev \
27-
libpq5 \
2827
libicu-dev \
2928
liblz4-1 \
3029
liblz4-dev \

0 commit comments

Comments
 (0)