From f7d82b756a1becafd892e9a9a3de92b1062126c3 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Fri, 3 Feb 2023 21:38:44 +1100
Subject: [PATCH] PHP 8.3 install install sockets and pcntl

---
 .gitlab-ci.yml              | 2 +-
 .gitlab-docker-arm64.yml    | 4 ++--
 .gitlab-docker-armv7l.yml   | 4 ++--
 .gitlab-docker-manifest.yml | 6 ++----
 .gitlab-docker-x86_64.yml   | 4 ++--
 Dockerfile                  | 8 +++-----
 Dockerfile.phptest          | 4 ++--
 7 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b59b9f7..87970fc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ stages:
 - build-manifest-test
 
 variables:
-  BRANCH: pgsql
+  BRANCH: pgsql-server
   VERSION: 8.3-fpm-${BRANCH}
   DOCKER_HOST: tcp://docker:2375
   VERSIONARCH: ${VERSION}-${ARCH}
diff --git a/.gitlab-docker-arm64.yml b/.gitlab-docker-arm64.yml
index 503c205..1a13468 100644
--- a/.gitlab-docker-arm64.yml
+++ b/.gitlab-docker-arm64.yml
@@ -13,7 +13,7 @@ arm64:build:
   - docker
   - arm64
   only:
-  - pgsql
+  - pgsql-server
 
 #arm64:build-test:
 #  variables:
@@ -26,4 +26,4 @@ arm64:build:
 #  - docker
 #  - arm64
 #  only:
-#  - pgsql
+#  - pgsql-server
diff --git a/.gitlab-docker-armv7l.yml b/.gitlab-docker-armv7l.yml
index 6de9bee..dd19170 100644
--- a/.gitlab-docker-armv7l.yml
+++ b/.gitlab-docker-armv7l.yml
@@ -13,7 +13,7 @@ armv7l:build:
   - docker
   - armv7l
   only:
-  - pgsql
+  - pgsql-server
 
 #armv7l:build-test:
 #  variables:
@@ -26,4 +26,4 @@ armv7l:build:
 #  - docker
 #  - armv7l
 #  only:
-#  - pgsql
+#  - pgsql-server
diff --git a/.gitlab-docker-manifest.yml b/.gitlab-docker-manifest.yml
index 503ca35..b90c6ae 100644
--- a/.gitlab-docker-manifest.yml
+++ b/.gitlab-docker-manifest.yml
@@ -3,13 +3,11 @@ x86_64:build-manifest:
   script:
   - docker manifest create ${CI_REGISTRY_IMAGE}:${VERSION} ${CI_REGISTRY_IMAGE}:${VERSION}-x86_64 ${CI_REGISTRY_IMAGE}:${VERSION}-arm64 ${CI_REGISTRY_IMAGE}:${VERSION}-armv7l
   - docker manifest push --purge ${CI_REGISTRY_IMAGE}:${VERSION}
-  - apk add --no-cache curl
-  - if [ -n "${AUTO_BUILD}" ]; then curl -LX POST --post301 -F token=${TRIGGER_TOKEN} -F ref=pgsql-server ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/trigger/pipeline; fi
   tags:
   - docker
   - x86_64
   only:
-  - pgsql
+  - pgsql-server
 
 x86_64:build-manifest-test:
   stage: build-manifest-test
@@ -20,4 +18,4 @@ x86_64:build-manifest-test:
   - docker
   - x86_64
   only:
-  - pgsql
+  - pgsql-server
diff --git a/.gitlab-docker-x86_64.yml b/.gitlab-docker-x86_64.yml
index 33f48eb..0c327a0 100644
--- a/.gitlab-docker-x86_64.yml
+++ b/.gitlab-docker-x86_64.yml
@@ -13,7 +13,7 @@ x86_64:build:
   - docker
   - x86_64
   only:
-  - pgsql
+  - pgsql-server
 
 x86_64:build-test:
   variables:
@@ -26,4 +26,4 @@ x86_64:build-test:
   - docker
   - x86_64
   only:
-  - pgsql
+  - pgsql-server
diff --git a/Dockerfile b/Dockerfile
index 29a9d36..f9e6d70 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,6 @@
 # NAME leenooks/php
-# VERSION 8.3-fpm-pgsql
+# VERSION 8.3-fpm-pgsql-server
 
-FROM registry.dege.au/leenooks/php:8.3-fpm
+FROM registry.dege.au/leenooks/php:8.3-fpm-pgsql
 
-RUN apk add --no-cache postgresql-client libpq libpq-dev && \
-	docker-php-ext-install -j$(nproc) pdo_pgsql && \
-	apk del --no-cache libpq-dev
+RUN docker-php-ext-install -j$(nproc) sockets pcntl
diff --git a/Dockerfile.phptest b/Dockerfile.phptest
index 1e5e643..f94d8e8 100644
--- a/Dockerfile.phptest
+++ b/Dockerfile.phptest
@@ -1,7 +1,7 @@
 # NAME leenooks/php
-# VERSION 8.3-fpm-pgsql-test
+# VERSION 8.3-fpm-pgsql-server-test
 
-FROM registry.dege.au/leenooks/php:8.3-fpm-pgsql
+FROM registry.dege.au/leenooks/php:8.3-fpm-pgsql-server
 
 # Add xdebug
 RUN apk --no-cache add linux-headers \