From e5ca2b9055d5920f07bed49c33abebc8678601c9 Mon Sep 17 00:00:00 2001 From: Nick Schuch Date: Mon, 30 Mar 2026 11:24:48 +1000 Subject: [PATCH 1/4] Reinstate the non-node image tag for circleci (#120) --- docker-bake.hcl | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/docker-bake.hcl b/docker-bake.hcl index 390bbec..54ae432 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -144,10 +144,13 @@ target "circleci-node-20" { NODE_VERSION = 20 } - tags = [ + tags = flatten([ for r in REGISTRIES : - "${r}/skpr/php-circleci:${PHP_VERSION}-node20-${VERSION}-${STREAM}" - ] + [ + "${r}/skpr/php-circleci:${PHP_VERSION}-${VERSION}-${STREAM}", + "${r}/skpr/php-circleci:${PHP_VERSION}-node20-${VERSION}-${STREAM}", + ] + ]) } target "circleci-node-22" { From cabb052529089bb97cc4d525466fdbbf135b9d72 Mon Sep 17 00:00:00 2001 From: Nathan ter Bogt Date: Mon, 30 Mar 2026 16:11:18 +1300 Subject: [PATCH 2/4] Single Alpine definition (#119) * Include the alpine version only in the bake * Using latest for images so we don't need to update them * Bump alpine to 3.23 too --- base/Dockerfile | 6 +++--- cli/Dockerfile | 3 +-- docker-bake.hcl | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/base/Dockerfile b/base/Dockerfile index 646db4a..2e6f93d 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -1,13 +1,13 @@ -ARG ALPINE_VERSION=3.21 +ARG ALPINE_VERSION=latest ARG PHP_VERSION=8.0 FROM docker.io/skpr/docconv:alpine${ALPINE_VERSION} AS docconv FROM from_image AS base -ARG TARGETARCH -ARG ALPINE_VERSION=3.21 +ARG ALPINE_VERSION=latest ARG PHP_VERSION=8.0 +ARG TARGETARCH ENV ALPINE_VERSION=${ALPINE_VERSION} ENV PHP_MEMORY_LIMIT=128M diff --git a/cli/Dockerfile b/cli/Dockerfile index abe3c0c..9f14384 100644 --- a/cli/Dockerfile +++ b/cli/Dockerfile @@ -1,5 +1,4 @@ -ARG ALPINE_VERSION=3.21 - +ARG ALPINE_VERSION=latest FROM alpine:${ALPINE_VERSION} AS redis-cli RUN apk add redis diff --git a/docker-bake.hcl b/docker-bake.hcl index 54ae432..c1aebf2 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -3,7 +3,7 @@ variable "PHP_VERSION" { } variable "ALPINE_VERSION" { - default = "3.21" + default = "3.23" } variable "STREAM" { From a8b6268e0b6b80d0523874061637920b257381be Mon Sep 17 00:00:00 2001 From: Nathan ter Bogt Date: Mon, 11 May 2026 16:42:13 +1200 Subject: [PATCH 3/4] Updating CA to new skpr-internal certificate (#121) --- base/Dockerfile | 4 ++-- base/certs/skpr-alb-internal.crt | 29 ----------------------------- base/certs/skpr-internal-ca.crt | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 31 deletions(-) delete mode 100644 base/certs/skpr-alb-internal.crt create mode 100644 base/certs/skpr-internal-ca.crt diff --git a/base/Dockerfile b/base/Dockerfile index 2e6f93d..727e31d 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -84,8 +84,8 @@ COPY --from=docconv /usr/local/bin/docconv /usr/local/bin/docconv ADD conf.d/01_apcu.ini /etc/php/conf.d/01_apcu.ini ADD conf.d/50_overrides.ini /etc/php/conf.d/50_overrides.ini -ADD certs/skpr-alb-internal.crt /usr/local/share/ca-certificates/skpr-alb-internal.crt -RUN cat /usr/local/share/ca-certificates/skpr-alb-internal.crt >> /etc/ssl/certs/ca-certificates.crt +ADD certs/skpr-internal-ca.crt /usr/local/share/ca-certificates/skpr-internal-ca.crt +RUN update-ca-certificates # Drush uses /tmp. VOLUME /tmp diff --git a/base/certs/skpr-alb-internal.crt b/base/certs/skpr-alb-internal.crt deleted file mode 100644 index 7cd842d..0000000 --- a/base/certs/skpr-alb-internal.crt +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFADCCAuigAwIBAgIULDkIh/xeq+l4+jswiSzLPOOFuOAwDQYJKoZIhvcNAQEL -BQAwaDELMAkGA1UEBhMCQVUxDDAKBgNVBAgMA05TVzEPMA0GA1UEBwwGU3lkbmV5 -MRUwEwYDVQQKDAxQcmV2aW91c05leHQxDTALBgNVBAsMBFNrcHIxFDASBgNVBAMM -C3NrcHIuY29tLmF1MB4XDTIzMDcxODAyMDU1OFoXDTI2MDUwNzAyMDU1OFowYTEc -MBoGA1UEAwwTKi5hbGIuc2twci5pbnRlcm5hbDELMAkGA1UEBhMCQVUxDDAKBgNV -BAgMA05TVzEPMA0GA1UEBwwGU3luZGV5MRUwEwYDVQQKDAxQcmV2aW91c05leHQw -ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCoc/EnCbMjK0Nr1ms8RNEt -rVdMa9wbR3YYEkrRsGTdQC4QS+8kXkdWhAqkpTqFnSj4+k5wKyLkD2138cebKrH+ -9MmMEvKrNy0Dg4ZR8MwIS7h9V4XUXWhxizPhXDG+wtcxHJ5VXbbxQpyuED5aqZ4S -mLBVxyTav8DW/sCIE36P4gtQIug+/OKRqhJxAdcTPu7btGRTbsAzrrOMplZSgM3Y -3lbFeuU+++JNU+9zCejAu9iW7KfAcynkI9wCsADFSclv7yXGB2KGTWvEW9Iki2zA -ukcPUhBy3ziC2j6aXzB6EWUvEGLV7ozzxY4AZa/R+D+xMpnMtR5E1H3xVGlKiIVT -AgMBAAGjgagwgaUwDgYDVR0PAQH/BAQDAgWgMCAGA1UdJQEB/wQWMBQGCCsGAQUF -BwMBBggrBgEFBQcDAjAxBgNVHREEKjAoghFhbGIuc2twci5pbnRlcm5hbIITKi5h -bGIuc2twci5pbnRlcm5hbDAdBgNVHQ4EFgQUB7z0u0Ir4lZBMOgM8Pl3Bg1O5s4w -HwYDVR0jBBgwFoAUUXplF1KElwSxbhIFdPOSCputCWowDQYJKoZIhvcNAQELBQAD -ggIBAK8A5uPlzu3rJHdfEMQgriULMJB1YPiSyEAWOhb1/jk5VHUkrvzpCPhauW7b -d/Sh+nfZGOi3yfxSMKYXAiVgZCaoNnod9zPdKvU0pcESfuL4oQD74oLSsxfmHB8Y -jdEfv87ES5yefEB02A++kF3kruPD5iKRYgI4HSMOHuzOId2qINDPc8B04rvoWh0s -pbfXgYAOv4bpb1ktIaHoVkisb0n5IorUrFpAJoJ4VRnVaL7kFM/RyfPG5c2f4Ycc -6Ec+kqwCBssB1VTHQ2mlpaxMDjxVlp6p9z/1TnEZAu0HGU+ndC0WnqwR8AX4fNEN -eQntfOBYrQKd8bpwkjqzUV+1zNNU9ViEAlIO+WJaBrDHRdlXMpAvqTpHAFgX7HCu -tjsbNCCMEWZOc3JjaIIr6wUrspXHII3oGmN97b0bdgmh8QBR05Hgj5p8Iy/QAdju -fsjlZUPU+cSvmbePpLSv4OzYiLwdMrYU7u/u96PFP2OVFKRFRzTnpKxwp68RdCTO -mvekE40dq+bSxAn/yXr/A7G0BAGXAuvv9c94NYXHP5QgANxqGIjAZuuIvkYgOzKZ -BVtR/rx6/D6EdBXeX8hzNH5O969JcBL4r+XD9QRQ47Mo+NdF3O2uGPuFpgY3WhVU -98jdIRBQqq/8YJSJH2AqLeNW/CbAafPORQ1uirol5/THu70W ------END CERTIFICATE----- diff --git a/base/certs/skpr-internal-ca.crt b/base/certs/skpr-internal-ca.crt new file mode 100644 index 0000000..1609176 --- /dev/null +++ b/base/certs/skpr-internal-ca.crt @@ -0,0 +1,32 @@ +-----BEGIN CERTIFICATE----- +MIIFjzCCA3egAwIBAgIUK9hu5ECCTSNdtcovcug4EJsrg7EwDQYJKoZIhvcNAQEL +BQAwTjEeMBwGA1UEAwwVc2twci5pbnRlcm5hbCBSb290IENBMRYwFAYDVQQKDA1z +a3ByLmludGVybmFsMRQwEgYDVQQLDAtJbnRlcm5hbCBDQTAgFw0yNjA1MTEwNDA4 +NDhaGA8yMTI2MDQxNzA0MDg0OFowTjEeMBwGA1UEAwwVc2twci5pbnRlcm5hbCBS +b290IENBMRYwFAYDVQQKDA1za3ByLmludGVybmFsMRQwEgYDVQQLDAtJbnRlcm5h +bCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALybG4eHCX1O01Sl +T6TQ45x3DxVTdySnKbKVhdrdAezjU5+TzLkQCtr7pBTiMCuXw3dVQnMxqdFW9diz +pFEEyr0klKIK7Fq6xUfNtroDDmNR8GL6Th/LSISkQXgnH6ULkzBQcivArr3n/oYO +LyO6KtbzWCbfa3FNwc8CYq3uqwrbt1F8Zlj2MFECocvzQgKHeQ9gMdtVhtEVX3Bc +9Z0CqmfdJBmEjGTm3J/G4piHZf7+YHso9toeobuMfK+Qnp4yClEnCF7PRieEHM+t +Hv8YQnOE3aaxAb3reUaYaTeIghW9Pahv+SceUYt5S9quf2D0j0m39gbIqCWscGik +EQrDkcMN8IogNcoiRiE+JNWCuZBP23tZgg25uBzOMDsQONKrACrjBAiEmi8YVqEl +c0rpkDCUXQGmGSM6hZKHayl5269An0koCE8y5IdYcj9EMBT5NHCNyPrxecbplgjN +iOCT6TnrkND1KsgCSlkcV3enjeHxw+KtIgnua2wwJGWl4XbbG/PfHNzCjhwP943B +628gvxcX+7zYUw69cQFrUv0RADayKeILa+Fq9CfYm2qkro67IZbOKV7qA91mYOdc +xojBIboFFFA5TosCH+ao4pJSwLueHa4V/JgWrpOpaD6Aw+fbtR4TMnS6VEtuVwTR +gVsL0gyU3B3jj4XcJAPhFPO1aG+/AgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8w +DgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBSygM5RPNN7ccStjdyC2d4m4Rd6QDAf +BgNVHSMEGDAWgBSygM5RPNN7ccStjdyC2d4m4Rd6QDANBgkqhkiG9w0BAQsFAAOC +AgEAIdrHFB7AQ5aUOU4bycflpRKdxE3wHh02nIUsLb2fSEF6lWAHF3MenwOkijo1 +Bsw64L41H65BgsFk1wYLb3CEQFZZTZyZhVUmXmuKBh1goJJXDkvD4TUpR3+9xEmD +nDcAMKdK9KzAXAlAS7e03/pRbJfzbArvqsj0pjs+LJVbisxiAK/XDTXthLO21clo +dRqheFVH3tA2J4iBk9nWhzZnZ02iM/LKKs7CFECNmkB217jL/L+ZZZcFPQvsMlXX +1YOqDKQGc+IbQ6YVmFg0iz4b4/HbXYuzxQ0kofecXWh3pdxpxKlLNogHDMq7/7o0 +2n3L5muwCHVWl9iqYpOt2EuT4Xu9sRQdEh9gFwlrJs7YKELir0tfq8wCVYRNEI2J +6dhQpOCUxw/YA/70NhfihfAzNjZZ/1I/KMlgyar01k7eSSTnSmBXR8KbpPbdN/IQ +WIWQaiOiDjb2KuyaQ0ujAODruTxM2gQ/whJmVQZQpVE95FI9wVgTY1TCgkHmXmaZ +jizlguvSf2LPBZV4Gz4lQonFZW0ptEGOmn3Z1FQRyWMAierVxQDPNoYAnEIo2103 +TcZ29F1D0T84jRzdSwmp2PFC7o3uOj+g2X5J2TcQ9Nq9hlh14bXihDHX9DQ7ZZnf +ff/BDC2If4J7RhW8IbxCpmSqt4omeoGPu595oQj0jEtG/iY= +-----END CERTIFICATE----- From 11505da33861e3ead82a45c58b1b8df9cb08acae Mon Sep 17 00:00:00 2001 From: Nathan ter Bogt Date: Tue, 26 May 2026 09:53:51 +1200 Subject: [PATCH 4/4] Remap circleci FPM port as it conflicts with selenium video recorder (#122) --- .gitignore | 1 + circleci/Dockerfile | 4 ++-- circleci/nginx/default.conf | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..485dee6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.idea diff --git a/circleci/Dockerfile b/circleci/Dockerfile index db776f0..347ef51 100644 --- a/circleci/Dockerfile +++ b/circleci/Dockerfile @@ -20,14 +20,14 @@ COPY fpm/php-fpm.conf /etc/php/php-fpm.conf # Configuration which can be overriden. # See /etc/php/php-fpm.conf -ENV PHP_FPM_PORT=9000 \ +ENV PHP_FPM_PORT=9002 \ PHP_FPM_MAX_CHILDREN=20 \ PHP_FPM_START_SERVERS=2 \ PHP_FPM_MIN_SPARE_SERVERS=2 \ PHP_FPM_MAX_SPARE_SERVERS=10 \ PHP_FPM_MAX_REQUESTS=500 -EXPOSE 9000 +EXPOSE 9002 # Configuration duplicated from the Nginx Dockerfile. RUN apk --update --no-cache add nginx diff --git a/circleci/nginx/default.conf b/circleci/nginx/default.conf index 8742190..0f6dec9 100644 --- a/circleci/nginx/default.conf +++ b/circleci/nginx/default.conf @@ -82,7 +82,7 @@ server { add_header Strict-Transport-Security $strict_transport_security; location ~ '\.php$|^/update.php' { - fastcgi_pass localhost:9000; + fastcgi_pass localhost:9002; if ($cookie_XDEBUG_SESSION){ fastcgi_pass localhost:9001;