From 4f88391085991d35a8b60fc89be8001987ac2e3e Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Thu, 8 Feb 2024 11:01:53 +0000 Subject: [PATCH 1/2] postgres 16.2 --- php-80/Dockerfile | 2 +- php-81/Dockerfile | 2 +- php-82/Dockerfile | 2 +- php-83/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/php-80/Dockerfile b/php-80/Dockerfile index 6b3be62f..7376d203 100644 --- a/php-80/Dockerfile +++ b/php-80/Dockerfile @@ -336,7 +336,7 @@ RUN make install # - OpenSSL # Needed by: # - php -ENV VERSION_POSTGRES=15.5 +ENV VERSION_POSTGRES=16.2 ENV POSTGRES_BUILD_DIR=${BUILD_DIR}/postgres RUN set -xe; \ mkdir -p ${POSTGRES_BUILD_DIR}/bin; \ diff --git a/php-81/Dockerfile b/php-81/Dockerfile index 7b7b8f41..026b0c07 100644 --- a/php-81/Dockerfile +++ b/php-81/Dockerfile @@ -337,7 +337,7 @@ RUN make install # - OpenSSL # Needed by: # - php -ENV VERSION_POSTGRES=15.5 +ENV VERSION_POSTGRES=16.2 ENV POSTGRES_BUILD_DIR=${BUILD_DIR}/postgres RUN set -xe; \ mkdir -p ${POSTGRES_BUILD_DIR}/bin; \ diff --git a/php-82/Dockerfile b/php-82/Dockerfile index 8b70de65..b5c57fdd 100644 --- a/php-82/Dockerfile +++ b/php-82/Dockerfile @@ -337,7 +337,7 @@ RUN make install # - OpenSSL # Needed by: # - php -ENV VERSION_POSTGRES=15.5 +ENV VERSION_POSTGRES=16.2 ENV POSTGRES_BUILD_DIR=${BUILD_DIR}/postgres RUN set -xe; \ mkdir -p ${POSTGRES_BUILD_DIR}/bin; \ diff --git a/php-83/Dockerfile b/php-83/Dockerfile index 4e2a341c..1716a42c 100644 --- a/php-83/Dockerfile +++ b/php-83/Dockerfile @@ -337,7 +337,7 @@ RUN make install # - OpenSSL # Needed by: # - php -ENV VERSION_POSTGRES=15.5 +ENV VERSION_POSTGRES=16.2 ENV POSTGRES_BUILD_DIR=${BUILD_DIR}/postgres RUN set -xe; \ mkdir -p ${POSTGRES_BUILD_DIR}/bin; \ From e5b52ac6880b0b0ea0e559b56c049e6601963fe4 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Thu, 8 Feb 2024 11:08:59 +0000 Subject: [PATCH 2/2] Updated configure flags due to changes in postgres 16 --- php-80/Dockerfile | 2 +- php-81/Dockerfile | 2 +- php-82/Dockerfile | 2 +- php-83/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/php-80/Dockerfile b/php-80/Dockerfile index 7376d203..341fde9c 100644 --- a/php-80/Dockerfile +++ b/php-80/Dockerfile @@ -346,7 +346,7 @@ WORKDIR ${POSTGRES_BUILD_DIR}/ RUN CFLAGS="" \ CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \ LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \ - ./configure --prefix=${INSTALL_DIR} --with-openssl --without-readline + ./configure --prefix=${INSTALL_DIR} --with-openssl --without-icu --without-readline RUN cd ${POSTGRES_BUILD_DIR}/src/interfaces/libpq && make && make install RUN cd ${POSTGRES_BUILD_DIR}/src/bin/pg_config && make && make install RUN cd ${POSTGRES_BUILD_DIR}/src/backend && make generated-headers diff --git a/php-81/Dockerfile b/php-81/Dockerfile index 026b0c07..7aed1706 100644 --- a/php-81/Dockerfile +++ b/php-81/Dockerfile @@ -347,7 +347,7 @@ WORKDIR ${POSTGRES_BUILD_DIR}/ RUN CFLAGS="" \ CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \ LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \ - ./configure --prefix=${INSTALL_DIR} --with-openssl --without-readline + ./configure --prefix=${INSTALL_DIR} --with-openssl --without-icu --without-readline RUN cd ${POSTGRES_BUILD_DIR}/src/interfaces/libpq && make && make install RUN cd ${POSTGRES_BUILD_DIR}/src/bin/pg_config && make && make install RUN cd ${POSTGRES_BUILD_DIR}/src/backend && make generated-headers diff --git a/php-82/Dockerfile b/php-82/Dockerfile index b5c57fdd..2738dc33 100644 --- a/php-82/Dockerfile +++ b/php-82/Dockerfile @@ -347,7 +347,7 @@ WORKDIR ${POSTGRES_BUILD_DIR}/ RUN CFLAGS="" \ CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \ LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \ - ./configure --prefix=${INSTALL_DIR} --with-openssl --without-readline + ./configure --prefix=${INSTALL_DIR} --with-openssl --without-icu --without-readline RUN cd ${POSTGRES_BUILD_DIR}/src/interfaces/libpq && make && make install RUN cd ${POSTGRES_BUILD_DIR}/src/bin/pg_config && make && make install RUN cd ${POSTGRES_BUILD_DIR}/src/backend && make generated-headers diff --git a/php-83/Dockerfile b/php-83/Dockerfile index 1716a42c..9b8cc2fb 100644 --- a/php-83/Dockerfile +++ b/php-83/Dockerfile @@ -347,7 +347,7 @@ WORKDIR ${POSTGRES_BUILD_DIR}/ RUN CFLAGS="" \ CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \ LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \ - ./configure --prefix=${INSTALL_DIR} --with-openssl --without-readline + ./configure --prefix=${INSTALL_DIR} --with-openssl --without-icu --without-readline RUN cd ${POSTGRES_BUILD_DIR}/src/interfaces/libpq && make && make install RUN cd ${POSTGRES_BUILD_DIR}/src/bin/pg_config && make && make install RUN cd ${POSTGRES_BUILD_DIR}/src/backend && make generated-headers