From fcd3123829b73826b9f24414bc0093ddbf8efb2c Mon Sep 17 00:00:00 2001 From: pablojmarti Date: Fri, 24 Apr 2026 13:18:54 -0400 Subject: [PATCH 01/14] Force npm package install of serverless for versions > 16 --- build/install-node.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/build/install-node.sh b/build/install-node.sh index 6a26dc8..f19ab43 100644 --- a/build/install-node.sh +++ b/build/install-node.sh @@ -29,10 +29,16 @@ npm install -g \ bower \ yarn \ lighthouse@~10.4 \ - serverless \ firebase-tools \ cypress@~13.1 +# TEMP FIX for issues with installing node 16 +# will be addressed in an upcoming version update +if [[ "${NODE_VERSION}" != "16" ]]; +then + npm install -g serverless +fi + npm cache clean --force echo "node ${NODE_VERSION} build completed..." From 80a69dd4ad4d8f8fdbff3cc87293709ec6a97455 Mon Sep 17 00:00:00 2001 From: pablojmarti Date: Fri, 24 Apr 2026 13:42:52 -0400 Subject: [PATCH 02/14] updates base image to bookworm --- .github/workflows/build.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 2ebde29..022607f 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -12,7 +12,7 @@ jobs: build_push_to_dockerhub: strategy: matrix: - base_container: ["php:7.4-bullseye", "php:8.0-bullseye", "php:8.1-bullseye", "php:8.2-bullseye", "php:8.3-bullseye", "php:8.4-bullseye"] + base_container: ["php:7.4-bookworm", "php:8.0-bullseye", "php:8.1-bullseye", "php:8.2-bullseye", "php:8.3-bullseye", "php:8.4-bullseye"] runs-on: ubuntu-latest steps: @@ -25,37 +25,37 @@ jobs: # upon EOL, this should move to 8.0 # 7.4 has already reached EoL, we can consider 8.0 as default version now - name: Set PHP 7.4 settings - if: ${{ matrix.base_container == 'php:7.4-bullseye' }} + if: ${{ matrix.base_container == 'php:7.4-bookworm' }} run: | echo "BUILD_TAGS=10up/wordpress-ci:latest,10up/wordpress-ci:php-7.4" >> $GITHUB_ENV echo "COMPOSER_VERSION=1" >> $GITHUB_ENV - name: Set PHP 8.0 settings - if: ${{ matrix.base_container == 'php:8.0-bullseye' }} + if: ${{ matrix.base_container == 'php:8.0-bookworm' }} run: | echo "BUILD_TAGS=10up/wordpress-ci:php-8.0" >> $GITHUB_ENV echo "COMPOSER_VERSION=2" >> $GITHUB_ENV - name: Set PHP 8.1 settings - if: ${{ matrix.base_container == 'php:8.1-bullseye' }} + if: ${{ matrix.base_container == 'php:8.1-bookworm' }} run: | echo "BUILD_TAGS=10up/wordpress-ci:php-8.1" >> $GITHUB_ENV echo "COMPOSER_VERSION=2" >> $GITHUB_ENV - name: Set PHP 8.2 settings - if: ${{ matrix.base_container == 'php:8.2-bullseye' }} + if: ${{ matrix.base_container == 'php:8.2-bookworm' }} run: | echo "BUILD_TAGS=10up/wordpress-ci:php-8.2" >> $GITHUB_ENV echo "COMPOSER_VERSION=2" >> $GITHUB_ENV - name: Set PHP 8.3 settings - if: ${{ matrix.base_container == 'php:8.3-bullseye' }} + if: ${{ matrix.base_container == 'php:8.3-bookworm' }} run: | echo "BUILD_TAGS=10up/wordpress-ci:php-8.3" >> $GITHUB_ENV echo "COMPOSER_VERSION=2" >> $GITHUB_ENV - name: Set PHP 8.4 settings - if: ${{ matrix.base_container == 'php:8.4-bullseye' }} + if: ${{ matrix.base_container == 'php:8.4-bookworm' }} run: | echo "BUILD_TAGS=10up/wordpress-ci:php-8.4" >> $GITHUB_ENV echo "COMPOSER_VERSION=2" >> $GITHUB_ENV From 64e908c668e94a260456096c788452f48ff534b3 Mon Sep 17 00:00:00 2001 From: pablojmarti Date: Fri, 24 Apr 2026 13:45:35 -0400 Subject: [PATCH 03/14] Reverts 7.4 to bullseye --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 022607f..fe8b4da 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -12,7 +12,7 @@ jobs: build_push_to_dockerhub: strategy: matrix: - base_container: ["php:7.4-bookworm", "php:8.0-bullseye", "php:8.1-bullseye", "php:8.2-bullseye", "php:8.3-bullseye", "php:8.4-bullseye"] + base_container: ["php:7.4-bullseye", "php:8.0-bullseye", "php:8.1-bullseye", "php:8.2-bullseye", "php:8.3-bullseye", "php:8.4-bullseye"] runs-on: ubuntu-latest steps: @@ -25,7 +25,7 @@ jobs: # upon EOL, this should move to 8.0 # 7.4 has already reached EoL, we can consider 8.0 as default version now - name: Set PHP 7.4 settings - if: ${{ matrix.base_container == 'php:7.4-bookworm' }} + if: ${{ matrix.base_container == 'php:7.4-bullseye' }} run: | echo "BUILD_TAGS=10up/wordpress-ci:latest,10up/wordpress-ci:php-7.4" >> $GITHUB_ENV echo "COMPOSER_VERSION=1" >> $GITHUB_ENV From 573bf0d6e8d0ed134f2e6c2335f05c9c21819397 Mon Sep 17 00:00:00 2001 From: pablojmarti Date: Fri, 24 Apr 2026 13:53:35 -0400 Subject: [PATCH 04/14] fix typo --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index fe8b4da..89dedf1 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -12,7 +12,7 @@ jobs: build_push_to_dockerhub: strategy: matrix: - base_container: ["php:7.4-bullseye", "php:8.0-bullseye", "php:8.1-bullseye", "php:8.2-bullseye", "php:8.3-bullseye", "php:8.4-bullseye"] + base_container: ["php:7.4-bullseye", "php:8.0-bookworm", "php:8.1-bookworm", "php:8.2-bookworm", "php:8.3-bookworm", "php:8.4-bookworm"] runs-on: ubuntu-latest steps: From 9dfc8e41881033916b37e6796b512113c5339b6f Mon Sep 17 00:00:00 2001 From: pablojmarti Date: Fri, 24 Apr 2026 13:59:19 -0400 Subject: [PATCH 05/14] update 8.0 and 8.2 to use bullseye still --- .github/workflows/build.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 89dedf1..46a5194 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -12,7 +12,7 @@ jobs: build_push_to_dockerhub: strategy: matrix: - base_container: ["php:7.4-bullseye", "php:8.0-bookworm", "php:8.1-bookworm", "php:8.2-bookworm", "php:8.3-bookworm", "php:8.4-bookworm"] + base_container: ["php:7.4-bullseye", "php:8.0-bullseye", "php:8.1-bullseye", "php:8.2-bookworm", "php:8.3-bookworm", "php:8.4-bookworm"] runs-on: ubuntu-latest steps: @@ -31,13 +31,13 @@ jobs: echo "COMPOSER_VERSION=1" >> $GITHUB_ENV - name: Set PHP 8.0 settings - if: ${{ matrix.base_container == 'php:8.0-bookworm' }} + if: ${{ matrix.base_container == 'php:8.0-bullseye' }} run: | echo "BUILD_TAGS=10up/wordpress-ci:php-8.0" >> $GITHUB_ENV echo "COMPOSER_VERSION=2" >> $GITHUB_ENV - name: Set PHP 8.1 settings - if: ${{ matrix.base_container == 'php:8.1-bookworm' }} + if: ${{ matrix.base_container == 'php:8.1-bullseye' }} run: | echo "BUILD_TAGS=10up/wordpress-ci:php-8.1" >> $GITHUB_ENV echo "COMPOSER_VERSION=2" >> $GITHUB_ENV From e4c4440907b49bf28a4c8efde7030b2e92cc92df Mon Sep 17 00:00:00 2001 From: pablojmarti Date: Fri, 24 Apr 2026 14:41:59 -0400 Subject: [PATCH 06/14] updates to fix python issues --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9f60a30..7240fda 100644 --- a/Dockerfile +++ b/Dockerfile @@ -121,9 +121,9 @@ RUN gem install compass ## Ansible, awscli, other Python tools ## -COPY requirements.txt /tmp/requirements.txt +COPY requirements.txt /tmp/requirements.txt RUN python3 -m pip -V && \ - python3 -m pip install -r /tmp/requirements.txt + python3 -m pip install --break-system-packages -r /tmp/requirements.txt #RUN pip3 install --upgrade pip && pip3 --no-cache-dir install -r /tmp/requirements.txt ## Composer ## From c06fc7853fad74b8b3c8981e0b411a0b071a71c2 Mon Sep 17 00:00:00 2001 From: pablojmarti Date: Fri, 24 Apr 2026 14:59:45 -0400 Subject: [PATCH 07/14] Claude says --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7240fda..82d09f1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -123,8 +123,8 @@ RUN gem install compass COPY requirements.txt /tmp/requirements.txt RUN python3 -m pip -V && \ + python3 -m pip install --upgrade pip && \ python3 -m pip install --break-system-packages -r /tmp/requirements.txt -#RUN pip3 install --upgrade pip && pip3 --no-cache-dir install -r /tmp/requirements.txt ## Composer ## ARG COMPOSER_VERSION 1 From 30c51e5130096e7bba6e97837f095610bfa48a28 Mon Sep 17 00:00:00 2001 From: pablojmarti Date: Fri, 24 Apr 2026 15:21:49 -0400 Subject: [PATCH 08/14] Remove python --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 82d09f1..6df892e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -121,10 +121,10 @@ RUN gem install compass ## Ansible, awscli, other Python tools ## -COPY requirements.txt /tmp/requirements.txt -RUN python3 -m pip -V && \ - python3 -m pip install --upgrade pip && \ - python3 -m pip install --break-system-packages -r /tmp/requirements.txt +# COPY requirements.txt /tmp/requirements.txt +# RUN python3 -m pip -V && \ +# python3 -m pip install --upgrade pip && \ +# python3 -m pip install --break-system-packages -r /tmp/requirements.txt ## Composer ## ARG COMPOSER_VERSION 1 From dbf3d19744a070b70b9ae3829986f6f14e351bc0 Mon Sep 17 00:00:00 2001 From: pablojmarti Date: Fri, 24 Apr 2026 15:45:32 -0400 Subject: [PATCH 09/14] try this claude thing --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6df892e..28ce88c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -121,10 +121,10 @@ RUN gem install compass ## Ansible, awscli, other Python tools ## -# COPY requirements.txt /tmp/requirements.txt -# RUN python3 -m pip -V && \ -# python3 -m pip install --upgrade pip && \ -# python3 -m pip install --break-system-packages -r /tmp/requirements.txt +COPY requirements.txt /tmp/requirements.txt +RUN PIP_BREAK_SYSTEM_PACKAGES=1 python3 -m pip -V && \ + PIP_BREAK_SYSTEM_PACKAGES=1 python3 -m pip install --upgrade pip && \ + PIP_BREAK_SYSTEM_PACKAGES=1 python3 -m pip install -r /tmp/requirements.txt ## Composer ## ARG COMPOSER_VERSION 1 From 2f9ec1b55b398dd0963b751d6a951561c2689a4a Mon Sep 17 00:00:00 2001 From: pablojmarti Date: Fri, 1 May 2026 10:44:06 -0400 Subject: [PATCH 10/14] Ignore claude --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 203191f..f5e43f9 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,5 @@ config.codekit id_rsa id_rsa.pub + +.claude From ec4296a69a447da743c8e89c76599614c8041b08 Mon Sep 17 00:00:00 2001 From: pablojmarti Date: Fri, 1 May 2026 11:23:36 -0400 Subject: [PATCH 11/14] Adds -p for ssh issues --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 28ce88c..973f118 100644 --- a/Dockerfile +++ b/Dockerfile @@ -197,7 +197,7 @@ ENV PATH="/custom-scripts:${PATH}" # Create SSH directory # SSH keys for deploys or auth are set in entrypoint.sh -RUN mkdir /root/.ssh && \ +RUN mkdir -p /root/.ssh && \ chmod 700 /root/.ssh # force CI jobs to source root's .bashrc, which will enable NVM From 2c0bd5ae50534fc7b0cd8b5bc350c234ab9c417b Mon Sep 17 00:00:00 2001 From: pablojmarti Date: Fri, 1 May 2026 13:01:12 -0400 Subject: [PATCH 12/14] Update ansible version --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a747fa9..8f619c5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,5 +6,5 @@ yq python-gitlab awesome-codename cryptography -ansible-core==2.17.6 +ansible-core==2.15.13 dnspython From 85e05f012a6fdc04fddfda0c87d315c09d177283 Mon Sep 17 00:00:00 2001 From: pablojmarti Date: Fri, 1 May 2026 13:09:45 -0400 Subject: [PATCH 13/14] Updates to retry action --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 46a5194..118baed 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -104,7 +104,7 @@ jobs: with: action: docker/build-push-action@v6 attempt_limit: 3 - attempt_delay: 5000 + attempt_delay: 30 with: | push: false # set to false for testing no-cache: true From 73461e48ffafa9845a0beda57f53e2adbe942fd8 Mon Sep 17 00:00:00 2001 From: pablojmarti Date: Tue, 19 May 2026 07:53:45 -0400 Subject: [PATCH 14/14] ignore local claude --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f5e43f9..4290a99 100644 --- a/.gitignore +++ b/.gitignore @@ -30,4 +30,4 @@ config.codekit id_rsa id_rsa.pub -.claude +.claude/settings.local.json