diff --git a/circleci/images/Makefile b/circleci/images/Makefile index 0389901..7396e2b 100644 --- a/circleci/images/Makefile +++ b/circleci/images/Makefile @@ -18,8 +18,8 @@ STYLE_CHECKER_TOOLS_VERSION=0.8.18 # we should add more majors/citus versions when we address https://github.com/citusdata/citus/issues/4807 CITUS_UPGRADE_PG_VERSIONS=$(shell head -n1 PG_VERSIONS|cut -c 6-|tr '\n' ' ' ) -# 10.2.0 is the oldest version supporting PG14, whereas 11.3.0 is for upgrade_pg_dist_cleanup tests -CITUS_UPGRADE_VERSIONS=v10.2.0 v11.3.0 +# 11.1.0 is the oldest version supporting PG15, whereas 11.3.0 is for upgrade_pg_dist_cleanup tests +CITUS_UPGRADE_VERSIONS=v11.1.0 v11.3.0 # code below creates targets for all postgres versions in PG_VERSIONS define make-image-targets diff --git a/circleci/images/PG_VERSIONS b/circleci/images/PG_VERSIONS index 01757ad..5261d18 100644 --- a/circleci/images/PG_VERSIONS +++ b/circleci/images/PG_VERSIONS @@ -1,4 +1,3 @@ -PG14=14.14 -PG15=15.9 -PG16=16.5 -PG17=17.1 +PG15=15.10 +PG16=16.6 +PG17=17.2 diff --git a/circleci/images/exttester/Dockerfile b/circleci/images/exttester/Dockerfile index 02bd74c..b9bb7f1 100644 --- a/circleci/images/exttester/Dockerfile +++ b/circleci/images/exttester/Dockerfile @@ -183,6 +183,10 @@ ENV PATH=/usr/lib/postgresql/$PG_MAJOR/bin/:$PATH # setup /var/run/postgresql for use with circleci RUN mkdir -p /var/run/postgresql && chown -R postgres:postgres /var/run/postgresql && chmod 2777 /var/run/postgresql +# fix symlink +RUN ln -fns /usr/lib/x86_64-linux-gnu/libpq.so.5.14 /usr/lib/x86_64-linux-gnu/libpq.so.5 +RUN ln -fns /usr/lib/x86_64-linux-gnu/libpq.so.5.14 /usr/lib/x86_64-linux-gnu/libpq.so + # copy the collected files from the collection container at once into the final container COPY --from=dev-tools-collection /collect/ /