From 4cd66cc890497125621132b760a166af248de412 Mon Sep 17 00:00:00 2001
From: Rasmus Werling <rasmus.werling@gmail.com>
Date: Tue, 28 May 2024 14:35:50 +0300
Subject: [PATCH 1/9] Updates to dependabot rules: Add missing packages and try
 to ignore as little dependencies as possible.

---
 .github/dependabot.yml | 113 +++++++++++++++++++----------------------
 1 file changed, 51 insertions(+), 62 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index e3fce7e8..259f8d5c 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -5,44 +5,44 @@ updates:
     schedule:
       interval: "daily"
     ignore:
-      - dependency-name: "*"
+      - dependency-name: "node"
         update-types: ["version-update:semver-major"]
   - package-ecosystem: "docker"
     directory: "/silta-node/14-alpine"
     schedule:
       interval: "daily"
     ignore:
-      - dependency-name: "*"
+      - dependency-name: "node"
         update-types: ["version-update:semver-major"]
   - package-ecosystem: "docker"
     directory: "/silta-node/16-alpine"
     schedule:
       interval: "daily"
     ignore:
-      - dependency-name: "*"
+      - dependency-name: "node"
         update-types: ["version-update:semver-major"]
   - package-ecosystem: "docker"
     directory: "/silta-node/18-alpine"
     schedule:
       interval: "daily"
     ignore:
-      - dependency-name: "*"
+      - dependency-name: "node"
         update-types: ["version-update:semver-major"]
   - package-ecosystem: "docker"
     directory: "/silta-node/20-alpine"
     schedule:
       interval: "daily"
     ignore:
-      - dependency-name: "*"
+      - dependency-name: "node"
         update-types: ["version-update:semver-major"]
-  
+
   - package-ecosystem: "docker"
     directory: "/silta-nginx/1.17"
     schedule:
       interval: "daily"
     ignore:
-      - dependency-name: "*"
-        update-types: 
+      - dependency-name: "nginx"
+        update-types:
           - "version-update:semver-major"
           - "version-update:semver-minor"
   - package-ecosystem: "docker"
@@ -50,8 +50,8 @@ updates:
     schedule:
       interval: "daily"
     ignore:
-      - dependency-name: "*"
-        update-types: 
+      - dependency-name: "nginx"
+        update-types:
           - "version-update:semver-major"
           - "version-update:semver-minor"
   - package-ecosystem: "docker"
@@ -59,8 +59,8 @@ updates:
     schedule:
       interval: "daily"
     ignore:
-      - dependency-name: "*"
-        update-types: 
+      - dependency-name: "nginx"
+        update-types:
           - "version-update:semver-major"
           - "version-update:semver-minor"
   - package-ecosystem: "docker"
@@ -68,8 +68,17 @@ updates:
     schedule:
       interval: "daily"
     ignore:
-      - dependency-name: "*"
-        update-types: 
+      - dependency-name: "nginx"
+        update-types:
+          - "version-update:semver-major"
+          - "version-update:semver-minor"
+  - package-ecosystem: "docker"
+    directory: "/silta-nginx/1.24"
+    schedule:
+      interval: "daily"
+    ignore:
+      - dependency-name: "nginx"
+        update-types:
           - "version-update:semver-major"
           - "version-update:semver-minor"
 
@@ -78,8 +87,8 @@ updates:
     schedule:
       interval: "daily"
     ignore:
-      - dependency-name: "*"
-        update-types: 
+      - dependency-name: "php"
+        update-types:
           - "version-update:semver-major"
           - "version-update:semver-minor"
   - package-ecosystem: "docker"
@@ -87,8 +96,8 @@ updates:
     schedule:
       interval: "daily"
     ignore:
-      - dependency-name: "*"
-        update-types: 
+      - dependency-name: "php"
+        update-types:
           - "version-update:semver-major"
           - "version-update:semver-minor"
   - package-ecosystem: "docker"
@@ -96,8 +105,8 @@ updates:
     schedule:
       interval: "daily"
     ignore:
-      - dependency-name: "*"
-        update-types: 
+      - dependency-name: "php"
+        update-types:
           - "version-update:semver-major"
           - "version-update:semver-minor"
   - package-ecosystem: "docker"
@@ -105,8 +114,8 @@ updates:
     schedule:
       interval: "daily"
     ignore:
-      - dependency-name: "*"
-        update-types: 
+      - dependency-name: "php"
+        update-types:
           - "version-update:semver-major"
           - "version-update:semver-minor"
   - package-ecosystem: "docker"
@@ -114,8 +123,8 @@ updates:
     schedule:
       interval: "daily"
     ignore:
-      - dependency-name: "*"
-        update-types: 
+      - dependency-name: "php"
+        update-types:
           - "version-update:semver-major"
           - "version-update:semver-minor"
   - package-ecosystem: "docker"
@@ -123,8 +132,8 @@ updates:
     schedule:
       interval: "daily"
     ignore:
-      - dependency-name: "*"
-        update-types: 
+      - dependency-name: "php"
+        update-types:
           - "version-update:semver-major"
           - "version-update:semver-minor"
 
@@ -132,63 +141,40 @@ updates:
     directory: "/silta-php-shell/php-7.2"
     schedule:
       interval: "daily"
-    ignore:
-      - dependency-name: "*"
-        update-types: 
-          - "version-update:semver-major"
-          - "version-update:semver-minor"
   - package-ecosystem: "docker"
     directory: "/silta-php-shell/php-7.3"
     schedule:
       interval: "daily"
-    ignore:
-      - dependency-name: "*"
-        update-types: 
-          - "version-update:semver-major"
-          - "version-update:semver-minor"
   - package-ecosystem: "docker"
     directory: "/silta-php-shell/php-7.4"
     schedule:
       interval: "daily"
-    ignore:
-      - dependency-name: "*"
-        update-types: 
-          - "version-update:semver-major"
-          - "version-update:semver-minor"
   - package-ecosystem: "docker"
     directory: "/silta-php-shell/php-8.0"
     schedule:
       interval: "daily"
-    ignore:
-      - dependency-name: "*"
-        update-types: 
-          - "version-update:semver-major"
-          - "version-update:semver-minor"
   - package-ecosystem: "docker"
     directory: "/silta-php-shell/php-8.1"
     schedule:
       interval: "daily"
-    ignore:
-      - dependency-name: "*"
-        update-types: 
-          - "version-update:semver-major"
-          - "version-update:semver-minor"
   - package-ecosystem: "docker"
     directory: "/silta-php-shell/php-8.2"
     schedule:
       interval: "daily"
-    ignore:
-      - dependency-name: "*"
-        update-types: 
-          - "version-update:semver-major"
-          - "version-update:semver-minor"
 
   - package-ecosystem: "docker"
     directory: "/silta-varnish/varnish6"
     schedule:
       interval: "daily"
     ignore:
-      - dependency-name: "*"
+      - dependency-name: "varnish"
+        update-types: ["version-update:semver-major"]
+  - package-ecosystem: "docker"
+    directory: "/silta-varnish/varnish7"
+    schedule:
+      interval: "daily"
+    ignore:
+      - dependency-name: "varnish"
         update-types: ["version-update:semver-major"]
 
   - package-ecosystem: "docker"
@@ -201,6 +187,11 @@ updates:
     schedule:
       interval: "daily"
 
+  - package-ecosystem: "docker"
+    directory: "/silta-robot-framework/robot-6"
+    schedule:
+      interval: "daily"
+
   - package-ecosystem: "docker"
     directory: "/silta-rsync/rsync"
     schedule:
@@ -211,7 +202,7 @@ updates:
     schedule:
       interval: "daily"
     ignore:
-      - dependency-name: "*"
+      - dependency-name: "geerlingguy/solr"
         update-types: ["version-update:semver-major"]
 
   - package-ecosystem: "docker"
@@ -219,7 +210,5 @@ updates:
     schedule:
       interval: "daily"
     ignore:
-      - dependency-name: "*"
-        update-types: 
-          - "version-update:semver-major"
-          - "version-update:semver-minor"
+      - dependency-name: "nginxinc/nginx-unprivileged"
+        update-types: ["version-update:semver-major"]

From 72d3dfc8518de94f1544d7b3dfd76bc993287f7b Mon Sep 17 00:00:00 2001
From: Rasmus Werling <rasmus.werling@gmail.com>
Date: Wed, 29 May 2024 09:58:46 +0300
Subject: [PATCH 2/9] For cicd images using cimg/php as base image: Install
 node.js and yarn ourselves to gain full control over their versions, and so
 it allows us to update base image patch versions.

---
 .../Dockerfile                                | 19 ++++++++++++++++++-
 .../README.md                                 |  5 ++++-
 .../circleci-php8.0-node16-composer2/TAGS     |  4 ++--
 .../Dockerfile                                | 19 ++++++++++++++++++-
 .../README.md                                 |  5 ++++-
 .../circleci-php8.1-node16-composer2/TAGS     |  4 ++--
 .../Dockerfile                                | 19 ++++++++++++++++++-
 .../README.md                                 |  5 ++++-
 .../circleci-php8.1-node18-composer2/TAGS     |  4 ++--
 .../Dockerfile                                | 19 ++++++++++++++++++-
 .../README.md                                 |  7 +++++--
 .../circleci-php8.2-node18-composer2/TAGS     |  4 ++--
 .../Dockerfile                                | 19 ++++++++++++++++++-
 .../README.md                                 |  5 ++++-
 .../circleci-php8.2-node20-composer2/TAGS     |  4 ++--
 15 files changed, 121 insertions(+), 21 deletions(-)

diff --git a/silta-cicd/circleci-php8.0-node16-composer2/Dockerfile b/silta-cicd/circleci-php8.0-node16-composer2/Dockerfile
index 0fc05511..11d7d599 100644
--- a/silta-cicd/circleci-php8.0-node16-composer2/Dockerfile
+++ b/silta-cicd/circleci-php8.0-node16-composer2/Dockerfile
@@ -1,4 +1,4 @@
-FROM cimg/php:8.0.13-node
+FROM cimg/php:8.0.13
 
 # Make composer packages executable.
 ENV PATH="/home/circleci/.composer/vendor/bin:${PATH}"
@@ -56,5 +56,22 @@ RUN sudo apt-get clean autoclean -y \
 # TODO: when https://github.com/lrills/helm-unittest/issues/87 is merged,
 # switch back to using https://github.com/lrills/helm-unittest as the source
 
+# Install Node.js and Yarn.
+# The following code is based on the CircleCI Node.js Dockerfile template:
+# https://github.com/CircleCI-Public/cimg-shared/blob/main/variants/node.Dockerfile.template
+ENV NODE_VERSION 16.13.0
+RUN echo "Installing Node.js version ${NODE_VERSION}"
+RUN curl -L -o node.tar.xz "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz" && \
+	sudo tar -xJf node.tar.xz -C /usr/local --strip-components=1 && \
+	rm node.tar.xz && \
+	sudo ln -s /usr/local/bin/node /usr/local/bin/nodejs
+
+ENV YARN_VERSION 1.22.5
+RUN curl -L -o yarn.tar.gz "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v${YARN_VERSION}.tar.gz" && \
+	sudo tar -xzf yarn.tar.gz -C /opt/ && \
+	rm yarn.tar.gz && \
+	sudo ln -s /opt/yarn-v${YARN_VERSION}/bin/yarn /usr/local/bin/yarn && \
+	sudo ln -s /opt/yarn-v${YARN_VERSION}/bin/yarnpkg /usr/local/bin/yarnpkg \
+
 # Add custom php config and lift memory limit.
 COPY conf/php/memory.ini /usr/local/etc/php/conf.d/memory.ini
diff --git a/silta-cicd/circleci-php8.0-node16-composer2/README.md b/silta-cicd/circleci-php8.0-node16-composer2/README.md
index a657adf3..006c5107 100644
--- a/silta-cicd/circleci-php8.0-node16-composer2/README.md
+++ b/silta-cicd/circleci-php8.0-node16-composer2/README.md
@@ -1,13 +1,16 @@
 # silta-circleci
-A docker image used circleCI, based on `cimg/php:8.0.13-node` with the following additions:
+A docker image used circleCI, based on `cimg/php:8.0.13` with the following additions:
 
 - Composer configured correctly
 - Drush-launcher and coder pre-installed
 - Vim, useful for debugging
 - kubernetes and helm
+- Node.js
+- Yarn
 
 ## Versions
 - PHP: 8.0.13
 - Composer: 2.1.12
 - Node: 16.13.0
+- Yarn: 1.22.5
 - Helm: v3.14.0
diff --git a/silta-cicd/circleci-php8.0-node16-composer2/TAGS b/silta-cicd/circleci-php8.0-node16-composer2/TAGS
index 0db1474b..23089edf 100644
--- a/silta-cicd/circleci-php8.0-node16-composer2/TAGS
+++ b/silta-cicd/circleci-php8.0-node16-composer2/TAGS
@@ -1,3 +1,3 @@
 circleci-php8.0-node16-composer2-v1
-circleci-php8.0-node16-composer2-v1.4
-circleci-php8.0-node16-composer2-v1.4.0
+circleci-php8.0-node16-composer2-v1.5
+circleci-php8.0-node16-composer2-v1.5.0
diff --git a/silta-cicd/circleci-php8.1-node16-composer2/Dockerfile b/silta-cicd/circleci-php8.1-node16-composer2/Dockerfile
index 319b5613..ae2e0b8d 100644
--- a/silta-cicd/circleci-php8.1-node16-composer2/Dockerfile
+++ b/silta-cicd/circleci-php8.1-node16-composer2/Dockerfile
@@ -1,4 +1,4 @@
-FROM cimg/php:8.1.7-node
+FROM cimg/php:8.1.7
 
 # Make composer packages executable.
 ENV PATH="/home/circleci/.composer/vendor/bin:${PATH}"
@@ -52,5 +52,22 @@ RUN curl -o /tmp/$FILENAME ${HELM_URL} \
 # TODO: when https://github.com/lrills/helm-unittest/issues/87 is merged,
 # switch back to using https://github.com/lrills/helm-unittest as the source
 
+# Install Node.js and Yarn.
+# The following code is based on the CircleCI Node.js Dockerfile template:
+# https://github.com/CircleCI-Public/cimg-shared/blob/main/variants/node.Dockerfile.template
+ENV NODE_VERSION 16.15.1
+RUN echo "Installing Node.js version ${NODE_VERSION}"
+RUN curl -L -o node.tar.xz "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz" && \
+	sudo tar -xJf node.tar.xz -C /usr/local --strip-components=1 && \
+	rm node.tar.xz && \
+	sudo ln -s /usr/local/bin/node /usr/local/bin/nodejs
+
+ENV YARN_VERSION 1.22.5
+RUN curl -L -o yarn.tar.gz "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v${YARN_VERSION}.tar.gz" && \
+	sudo tar -xzf yarn.tar.gz -C /opt/ && \
+	rm yarn.tar.gz && \
+	sudo ln -s /opt/yarn-v${YARN_VERSION}/bin/yarn /usr/local/bin/yarn && \
+	sudo ln -s /opt/yarn-v${YARN_VERSION}/bin/yarnpkg /usr/local/bin/yarnpkg \
+
 # Add custom php config and lift memory limit.
 COPY conf/php/memory.ini /usr/local/etc/php/conf.d/memory.ini
diff --git a/silta-cicd/circleci-php8.1-node16-composer2/README.md b/silta-cicd/circleci-php8.1-node16-composer2/README.md
index 81939b00..539392e6 100644
--- a/silta-cicd/circleci-php8.1-node16-composer2/README.md
+++ b/silta-cicd/circleci-php8.1-node16-composer2/README.md
@@ -1,13 +1,16 @@
 # silta-circleci
-A docker image used circleCI, based on `cimg/php:8.1.7-node` with the following additions:
+A docker image used circleCI, based on `cimg/php:8.1.7` with the following additions:
 
 - Composer configured correctly
 - Drush-launcher and coder pre-installed
 - Vim, useful for debugging
 - kubernetes and helm
+- Node.js
+- Yarn
 
 ## Versions
 - PHP: 8.1.7
 - Composer: 2.1.12
 - Node: 16.15.1
+- Yarn: 1.22.5
 - Helm: v3.14.0
diff --git a/silta-cicd/circleci-php8.1-node16-composer2/TAGS b/silta-cicd/circleci-php8.1-node16-composer2/TAGS
index 2eb7ccd5..33f5dfa5 100644
--- a/silta-cicd/circleci-php8.1-node16-composer2/TAGS
+++ b/silta-cicd/circleci-php8.1-node16-composer2/TAGS
@@ -1,3 +1,3 @@
 circleci-php8.1-node16-composer2-v1
-circleci-php8.1-node16-composer2-v1.3
-circleci-php8.1-node16-composer2-v1.3.0
+circleci-php8.1-node16-composer2-v1.4
+circleci-php8.1-node16-composer2-v1.4.0
diff --git a/silta-cicd/circleci-php8.1-node18-composer2/Dockerfile b/silta-cicd/circleci-php8.1-node18-composer2/Dockerfile
index b3dd7859..af5c5f74 100644
--- a/silta-cicd/circleci-php8.1-node18-composer2/Dockerfile
+++ b/silta-cicd/circleci-php8.1-node18-composer2/Dockerfile
@@ -1,4 +1,4 @@
-FROM cimg/php:8.1.23-node
+FROM cimg/php:8.1.23
 
 # Make composer packages executable.
 ENV PATH="/home/circleci/.composer/vendor/bin:${PATH}"
@@ -51,5 +51,22 @@ RUN curl -o /tmp/$FILENAME ${HELM_URL} \
 # TODO: when https://github.com/lrills/helm-unittest/issues/87 is merged,
 # switch back to using https://github.com/lrills/helm-unittest as the source
 
+# Install Node.js and Yarn.
+# The following code is based on the CircleCI Node.js Dockerfile template:
+# https://github.com/CircleCI-Public/cimg-shared/blob/main/variants/node.Dockerfile.template
+ENV NODE_VERSION 18.17.1
+RUN echo "Installing Node.js version ${NODE_VERSION}"
+RUN curl -L -o node.tar.xz "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz" && \
+	sudo tar -xJf node.tar.xz -C /usr/local --strip-components=1 && \
+	rm node.tar.xz && \
+	sudo ln -s /usr/local/bin/node /usr/local/bin/nodejs
+
+ENV YARN_VERSION 1.22.19
+RUN curl -L -o yarn.tar.gz "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v${YARN_VERSION}.tar.gz" && \
+	sudo tar -xzf yarn.tar.gz -C /opt/ && \
+	rm yarn.tar.gz && \
+	sudo ln -s /opt/yarn-v${YARN_VERSION}/bin/yarn /usr/local/bin/yarn && \
+	sudo ln -s /opt/yarn-v${YARN_VERSION}/bin/yarnpkg /usr/local/bin/yarnpkg \
+
 # Add custom php config and lift memory limit.
 COPY conf/php/memory.ini /usr/local/etc/php/conf.d/memory.ini
diff --git a/silta-cicd/circleci-php8.1-node18-composer2/README.md b/silta-cicd/circleci-php8.1-node18-composer2/README.md
index 10a16261..168dca03 100644
--- a/silta-cicd/circleci-php8.1-node18-composer2/README.md
+++ b/silta-cicd/circleci-php8.1-node18-composer2/README.md
@@ -1,13 +1,16 @@
 # silta-circleci
-A docker image used circleCI, based on `cimg/php:8.1.23-node` with the following additions:
+A docker image used circleCI, based on `cimg/php:8.1.23` with the following additions:
 
 - Composer configured correctly
 - Drush-launcher and coder pre-installed
 - Vim, useful for debugging
 - kubernetes and helm
+- Node.js
+- Yarn
 
 ## Versions
 - PHP: 8.1.23
 - Composer: 2.5.1
 - Node: 18.17.1
+- Yarn: 1.22.19
 - Helm: v3.14.0
diff --git a/silta-cicd/circleci-php8.1-node18-composer2/TAGS b/silta-cicd/circleci-php8.1-node18-composer2/TAGS
index c4910aea..89da7909 100644
--- a/silta-cicd/circleci-php8.1-node18-composer2/TAGS
+++ b/silta-cicd/circleci-php8.1-node18-composer2/TAGS
@@ -1,3 +1,3 @@
 circleci-php8.1-node18-composer2-v1
-circleci-php8.1-node18-composer2-v1.3
-circleci-php8.1-node18-composer2-v1.3.0
+circleci-php8.1-node18-composer2-v1.4
+circleci-php8.1-node18-composer2-v1.4.0
diff --git a/silta-cicd/circleci-php8.2-node18-composer2/Dockerfile b/silta-cicd/circleci-php8.2-node18-composer2/Dockerfile
index 298d53c5..4d013138 100644
--- a/silta-cicd/circleci-php8.2-node18-composer2/Dockerfile
+++ b/silta-cicd/circleci-php8.2-node18-composer2/Dockerfile
@@ -1,4 +1,4 @@
-FROM cimg/php:8.2.12-node
+FROM cimg/php:8.2.12
 
 # Make composer packages executable.
 ENV PATH="/home/circleci/.composer/vendor/bin:${PATH}"
@@ -51,5 +51,22 @@ RUN curl -o /tmp/$FILENAME ${HELM_URL} \
 # TODO: when https://github.com/lrills/helm-unittest/issues/87 is merged,
 # switch back to using https://github.com/lrills/helm-unittest as the source
 
+# Install Node.js and Yarn.
+# The following code is based on the CircleCI Node.js Dockerfile template:
+# https://github.com/CircleCI-Public/cimg-shared/blob/main/variants/node.Dockerfile.template
+ENV NODE_VERSION 18.18.2
+RUN echo "Installing Node.js version ${NODE_VERSION}"
+RUN curl -L -o node.tar.xz "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz" && \
+	sudo tar -xJf node.tar.xz -C /usr/local --strip-components=1 && \
+	rm node.tar.xz && \
+	sudo ln -s /usr/local/bin/node /usr/local/bin/nodejs
+
+ENV YARN_VERSION 1.22.19
+RUN curl -L -o yarn.tar.gz "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v${YARN_VERSION}.tar.gz" && \
+	sudo tar -xzf yarn.tar.gz -C /opt/ && \
+	rm yarn.tar.gz && \
+	sudo ln -s /opt/yarn-v${YARN_VERSION}/bin/yarn /usr/local/bin/yarn && \
+	sudo ln -s /opt/yarn-v${YARN_VERSION}/bin/yarnpkg /usr/local/bin/yarnpkg \
+
 # Add custom php config and lift memory limit.
 COPY conf/php/memory.ini /usr/local/etc/php/conf.d/memory.ini
diff --git a/silta-cicd/circleci-php8.2-node18-composer2/README.md b/silta-cicd/circleci-php8.2-node18-composer2/README.md
index b2ca8164..f4967144 100644
--- a/silta-cicd/circleci-php8.2-node18-composer2/README.md
+++ b/silta-cicd/circleci-php8.2-node18-composer2/README.md
@@ -1,13 +1,16 @@
 # silta-circleci
-A docker image used circleCI, based on `cimg/php:8.1.7-node` with the following additions:
+A docker image used circleCI, based on `cimg/php:8.2.12` with the following additions:
 
 - Composer configured correctly
 - Drush-launcher and coder pre-installed
 - Vim, useful for debugging
 - kubernetes and helm
+- Node.js
+- Yarn
 
 ## Versions
 - PHP: 8.2.0
 - Composer: 2.1.12
-- Node: 18.12.1
+- Node: 18.18.2
+- Yarn: 1.22.19
 - Helm: v3.14.0
diff --git a/silta-cicd/circleci-php8.2-node18-composer2/TAGS b/silta-cicd/circleci-php8.2-node18-composer2/TAGS
index 06a21432..fa604272 100644
--- a/silta-cicd/circleci-php8.2-node18-composer2/TAGS
+++ b/silta-cicd/circleci-php8.2-node18-composer2/TAGS
@@ -1,3 +1,3 @@
 circleci-php8.2-node18-composer2-v1
-circleci-php8.2-node18-composer2-v1.3
-circleci-php8.2-node18-composer2-v1.3.0
+circleci-php8.2-node18-composer2-v1.4
+circleci-php8.2-node18-composer2-v1.4.0
diff --git a/silta-cicd/circleci-php8.2-node20-composer2/Dockerfile b/silta-cicd/circleci-php8.2-node20-composer2/Dockerfile
index 4baf76cb..41b042c5 100644
--- a/silta-cicd/circleci-php8.2-node20-composer2/Dockerfile
+++ b/silta-cicd/circleci-php8.2-node20-composer2/Dockerfile
@@ -1,4 +1,4 @@
-FROM cimg/php:8.2.13-node
+FROM cimg/php:8.2.13
 
 # Make composer packages executable.
 ENV PATH="/home/circleci/.composer/vendor/bin:${PATH}"
@@ -51,5 +51,22 @@ RUN curl -o /tmp/$FILENAME ${HELM_URL} \
 # TODO: when https://github.com/lrills/helm-unittest/issues/87 is merged,
 # switch back to using https://github.com/lrills/helm-unittest as the source
 
+# Install Node.js and Yarn.
+# The following code is based on the CircleCI Node.js Dockerfile template:
+# https://github.com/CircleCI-Public/cimg-shared/blob/main/variants/node.Dockerfile.template
+ENV NODE_VERSION 20.9.0
+RUN echo "Installing Node.js version ${NODE_VERSION}"
+RUN curl -L -o node.tar.xz "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz" && \
+	sudo tar -xJf node.tar.xz -C /usr/local --strip-components=1 && \
+	rm node.tar.xz && \
+	sudo ln -s /usr/local/bin/node /usr/local/bin/nodejs
+
+ENV YARN_VERSION 1.22.19
+RUN curl -L -o yarn.tar.gz "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v${YARN_VERSION}.tar.gz" && \
+	sudo tar -xzf yarn.tar.gz -C /opt/ && \
+	rm yarn.tar.gz && \
+	sudo ln -s /opt/yarn-v${YARN_VERSION}/bin/yarn /usr/local/bin/yarn && \
+	sudo ln -s /opt/yarn-v${YARN_VERSION}/bin/yarnpkg /usr/local/bin/yarnpkg
+
 # Add custom php config and lift memory limit.
 COPY conf/php/memory.ini /usr/local/etc/php/conf.d/memory.ini
diff --git a/silta-cicd/circleci-php8.2-node20-composer2/README.md b/silta-cicd/circleci-php8.2-node20-composer2/README.md
index ff0307b7..a1f2ad47 100644
--- a/silta-cicd/circleci-php8.2-node20-composer2/README.md
+++ b/silta-cicd/circleci-php8.2-node20-composer2/README.md
@@ -1,13 +1,16 @@
 # silta-circleci
-A docker image used circleCI, based on `cimg/php:8.2.13-node` with the following additions:
+A docker image used circleCI, based on `cimg/php:8.2.13` with the following additions:
 
 - Composer configured correctly
 - Drush-launcher and coder pre-installed
 - Vim, useful for debugging
 - kubernetes and helm
+- Node.js
+- Yarn
 
 ## Versions
 - PHP: 8.2.13
 - Composer: 2.5.1
 - Node: 20.9.0
+- Yarn: 1.22.19
 - Helm: v3.14.0
diff --git a/silta-cicd/circleci-php8.2-node20-composer2/TAGS b/silta-cicd/circleci-php8.2-node20-composer2/TAGS
index 5faebc6e..b99b6b88 100644
--- a/silta-cicd/circleci-php8.2-node20-composer2/TAGS
+++ b/silta-cicd/circleci-php8.2-node20-composer2/TAGS
@@ -1,3 +1,3 @@
 circleci-php8.2-node20-composer2-v1
-circleci-php8.2-node20-composer2-v1.2
-circleci-php8.2-node20-composer2-v1.2.0
+circleci-php8.2-node20-composer2-v1.3
+circleci-php8.2-node20-composer2-v1.3.0

From 14e079f56c3e73efc854e888f329b178907c93c3 Mon Sep 17 00:00:00 2001
From: Rasmus Werling <rasmus.werling@gmail.com>
Date: Wed, 29 May 2024 10:10:35 +0300
Subject: [PATCH 3/9] Remove extra backslashes.

---
 silta-cicd/circleci-php8.0-node16-composer2/Dockerfile | 2 +-
 silta-cicd/circleci-php8.1-node16-composer2/Dockerfile | 2 +-
 silta-cicd/circleci-php8.1-node18-composer2/Dockerfile | 2 +-
 silta-cicd/circleci-php8.2-node18-composer2/Dockerfile | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/silta-cicd/circleci-php8.0-node16-composer2/Dockerfile b/silta-cicd/circleci-php8.0-node16-composer2/Dockerfile
index 11d7d599..9adee427 100644
--- a/silta-cicd/circleci-php8.0-node16-composer2/Dockerfile
+++ b/silta-cicd/circleci-php8.0-node16-composer2/Dockerfile
@@ -71,7 +71,7 @@ RUN curl -L -o yarn.tar.gz "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v
 	sudo tar -xzf yarn.tar.gz -C /opt/ && \
 	rm yarn.tar.gz && \
 	sudo ln -s /opt/yarn-v${YARN_VERSION}/bin/yarn /usr/local/bin/yarn && \
-	sudo ln -s /opt/yarn-v${YARN_VERSION}/bin/yarnpkg /usr/local/bin/yarnpkg \
+	sudo ln -s /opt/yarn-v${YARN_VERSION}/bin/yarnpkg /usr/local/bin/yarnpkg
 
 # Add custom php config and lift memory limit.
 COPY conf/php/memory.ini /usr/local/etc/php/conf.d/memory.ini
diff --git a/silta-cicd/circleci-php8.1-node16-composer2/Dockerfile b/silta-cicd/circleci-php8.1-node16-composer2/Dockerfile
index ae2e0b8d..22890961 100644
--- a/silta-cicd/circleci-php8.1-node16-composer2/Dockerfile
+++ b/silta-cicd/circleci-php8.1-node16-composer2/Dockerfile
@@ -67,7 +67,7 @@ RUN curl -L -o yarn.tar.gz "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v
 	sudo tar -xzf yarn.tar.gz -C /opt/ && \
 	rm yarn.tar.gz && \
 	sudo ln -s /opt/yarn-v${YARN_VERSION}/bin/yarn /usr/local/bin/yarn && \
-	sudo ln -s /opt/yarn-v${YARN_VERSION}/bin/yarnpkg /usr/local/bin/yarnpkg \
+	sudo ln -s /opt/yarn-v${YARN_VERSION}/bin/yarnpkg /usr/local/bin/yarnpkg
 
 # Add custom php config and lift memory limit.
 COPY conf/php/memory.ini /usr/local/etc/php/conf.d/memory.ini
diff --git a/silta-cicd/circleci-php8.1-node18-composer2/Dockerfile b/silta-cicd/circleci-php8.1-node18-composer2/Dockerfile
index af5c5f74..da107264 100644
--- a/silta-cicd/circleci-php8.1-node18-composer2/Dockerfile
+++ b/silta-cicd/circleci-php8.1-node18-composer2/Dockerfile
@@ -66,7 +66,7 @@ RUN curl -L -o yarn.tar.gz "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v
 	sudo tar -xzf yarn.tar.gz -C /opt/ && \
 	rm yarn.tar.gz && \
 	sudo ln -s /opt/yarn-v${YARN_VERSION}/bin/yarn /usr/local/bin/yarn && \
-	sudo ln -s /opt/yarn-v${YARN_VERSION}/bin/yarnpkg /usr/local/bin/yarnpkg \
+	sudo ln -s /opt/yarn-v${YARN_VERSION}/bin/yarnpkg /usr/local/bin/yarnpkg
 
 # Add custom php config and lift memory limit.
 COPY conf/php/memory.ini /usr/local/etc/php/conf.d/memory.ini
diff --git a/silta-cicd/circleci-php8.2-node18-composer2/Dockerfile b/silta-cicd/circleci-php8.2-node18-composer2/Dockerfile
index 4d013138..aa588be1 100644
--- a/silta-cicd/circleci-php8.2-node18-composer2/Dockerfile
+++ b/silta-cicd/circleci-php8.2-node18-composer2/Dockerfile
@@ -66,7 +66,7 @@ RUN curl -L -o yarn.tar.gz "https://yarnpkg.com/downloads/${YARN_VERSION}/yarn-v
 	sudo tar -xzf yarn.tar.gz -C /opt/ && \
 	rm yarn.tar.gz && \
 	sudo ln -s /opt/yarn-v${YARN_VERSION}/bin/yarn /usr/local/bin/yarn && \
-	sudo ln -s /opt/yarn-v${YARN_VERSION}/bin/yarnpkg /usr/local/bin/yarnpkg \
+	sudo ln -s /opt/yarn-v${YARN_VERSION}/bin/yarnpkg /usr/local/bin/yarnpkg
 
 # Add custom php config and lift memory limit.
 COPY conf/php/memory.ini /usr/local/etc/php/conf.d/memory.ini

From 7e3293a7e3663fdc9d53ed83e3ebcdee4624742c Mon Sep 17 00:00:00 2001
From: Rasmus Werling <rasmus.werling@gmail.com>
Date: Tue, 11 Jun 2024 08:35:41 +0300
Subject: [PATCH 4/9] Add dependabot ignore rules for shell images.

---
 .github/dependabot.yml | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 259f8d5c..77abb9b0 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -141,26 +141,56 @@ updates:
     directory: "/silta-php-shell/php-7.2"
     schedule:
       interval: "daily"
+    ignore:
+      - dependency-name: "wunderio/silta-php-fpm"
+        update-types:
+          - "version-update:semver-major"
+          - "version-update:semver-minor"
   - package-ecosystem: "docker"
     directory: "/silta-php-shell/php-7.3"
     schedule:
       interval: "daily"
+    ignore:
+      - dependency-name: "wunderio/silta-php-fpm"
+        update-types:
+          - "version-update:semver-major"
+          - "version-update:semver-minor"
   - package-ecosystem: "docker"
     directory: "/silta-php-shell/php-7.4"
     schedule:
       interval: "daily"
+    ignore:
+      - dependency-name: "wunderio/silta-php-fpm"
+        update-types:
+          - "version-update:semver-major"
+          - "version-update:semver-minor"
   - package-ecosystem: "docker"
     directory: "/silta-php-shell/php-8.0"
     schedule:
       interval: "daily"
+    ignore:
+      - dependency-name: "wunderio/silta-php-fpm"
+        update-types:
+          - "version-update:semver-major"
+          - "version-update:semver-minor"
   - package-ecosystem: "docker"
     directory: "/silta-php-shell/php-8.1"
     schedule:
       interval: "daily"
+    ignore:
+      - dependency-name: "wunderio/silta-php-fpm"
+        update-types:
+          - "version-update:semver-major"
+          - "version-update:semver-minor"
   - package-ecosystem: "docker"
     directory: "/silta-php-shell/php-8.2"
     schedule:
       interval: "daily"
+    ignore:
+      - dependency-name: "wunderio/silta-php-fpm"
+        update-types:
+          - "version-update:semver-major"
+          - "version-update:semver-minor"
 
   - package-ecosystem: "docker"
     directory: "/silta-varnish/varnish6"

From d095410cc242e9ab630fbb947a1c715ec5920f59 Mon Sep 17 00:00:00 2001
From: Rasmus Werling <rasmus.werling@gmail.com>
Date: Tue, 11 Jun 2024 08:51:23 +0300
Subject: [PATCH 5/9] Organize dependabot rules in alphabetical order.

---
 .github/dependabot.yml | 116 +++++++++++++++++++++++------------------
 1 file changed, 64 insertions(+), 52 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 77abb9b0..6ec434b8 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,41 +1,13 @@
 version: 2
 updates:
+
+  # silta-mailhog
   - package-ecosystem: "docker"
-    directory: "/silta-node/12-alpine"
-    schedule:
-      interval: "daily"
-    ignore:
-      - dependency-name: "node"
-        update-types: ["version-update:semver-major"]
-  - package-ecosystem: "docker"
-    directory: "/silta-node/14-alpine"
-    schedule:
-      interval: "daily"
-    ignore:
-      - dependency-name: "node"
-        update-types: ["version-update:semver-major"]
-  - package-ecosystem: "docker"
-    directory: "/silta-node/16-alpine"
-    schedule:
-      interval: "daily"
-    ignore:
-      - dependency-name: "node"
-        update-types: ["version-update:semver-major"]
-  - package-ecosystem: "docker"
-    directory: "/silta-node/18-alpine"
-    schedule:
-      interval: "daily"
-    ignore:
-      - dependency-name: "node"
-        update-types: ["version-update:semver-major"]
-  - package-ecosystem: "docker"
-    directory: "/silta-node/20-alpine"
+    directory: "/silta-mailhog/silent"
     schedule:
       interval: "daily"
-    ignore:
-      - dependency-name: "node"
-        update-types: ["version-update:semver-major"]
 
+  # silta-nginx
   - package-ecosystem: "docker"
     directory: "/silta-nginx/1.17"
     schedule:
@@ -82,6 +54,44 @@ updates:
           - "version-update:semver-major"
           - "version-update:semver-minor"
 
+  # silta-node
+  - package-ecosystem: "docker"
+    directory: "/silta-node/12-alpine"
+    schedule:
+      interval: "daily"
+    ignore:
+      - dependency-name: "node"
+        update-types: ["version-update:semver-major"]
+  - package-ecosystem: "docker"
+    directory: "/silta-node/14-alpine"
+    schedule:
+      interval: "daily"
+    ignore:
+      - dependency-name: "node"
+        update-types: ["version-update:semver-major"]
+  - package-ecosystem: "docker"
+    directory: "/silta-node/16-alpine"
+    schedule:
+      interval: "daily"
+    ignore:
+      - dependency-name: "node"
+        update-types: ["version-update:semver-major"]
+  - package-ecosystem: "docker"
+    directory: "/silta-node/18-alpine"
+    schedule:
+      interval: "daily"
+    ignore:
+      - dependency-name: "node"
+        update-types: ["version-update:semver-major"]
+  - package-ecosystem: "docker"
+    directory: "/silta-node/20-alpine"
+    schedule:
+      interval: "daily"
+    ignore:
+      - dependency-name: "node"
+        update-types: ["version-update:semver-major"]
+
+  # silta-php-fpm
   - package-ecosystem: "docker"
     directory: "/silta-php-fpm/7.2-fpm"
     schedule:
@@ -137,6 +147,7 @@ updates:
           - "version-update:semver-major"
           - "version-update:semver-minor"
 
+  # silta-php-shell
   - package-ecosystem: "docker"
     directory: "/silta-php-shell/php-7.2"
     schedule:
@@ -192,41 +203,25 @@ updates:
           - "version-update:semver-major"
           - "version-update:semver-minor"
 
-  - package-ecosystem: "docker"
-    directory: "/silta-varnish/varnish6"
-    schedule:
-      interval: "daily"
-    ignore:
-      - dependency-name: "varnish"
-        update-types: ["version-update:semver-major"]
-  - package-ecosystem: "docker"
-    directory: "/silta-varnish/varnish7"
-    schedule:
-      interval: "daily"
-    ignore:
-      - dependency-name: "varnish"
-        update-types: ["version-update:semver-major"]
-
-  - package-ecosystem: "docker"
-    directory: "/silta-mailhog/silent"
-    schedule:
-      interval: "daily"
-
+  # silta-proxy
   - package-ecosystem: "docker"
     directory: "/silta-proxy/latest"
     schedule:
       interval: "daily"
 
+  # silta-robot-framework
   - package-ecosystem: "docker"
     directory: "/silta-robot-framework/robot-6"
     schedule:
       interval: "daily"
 
+  # silta-rsync
   - package-ecosystem: "docker"
     directory: "/silta-rsync/rsync"
     schedule:
       interval: "daily"
 
+  # silta-solr
   - package-ecosystem: "docker"
     directory: "/silta-solr/8"
     schedule:
@@ -235,6 +230,7 @@ updates:
       - dependency-name: "geerlingguy/solr"
         update-types: ["version-update:semver-major"]
 
+  # silta-splash
   - package-ecosystem: "docker"
     directory: "/silta-splash/latest"
     schedule:
@@ -242,3 +238,19 @@ updates:
     ignore:
       - dependency-name: "nginxinc/nginx-unprivileged"
         update-types: ["version-update:semver-major"]
+
+  # silta-varnish
+  - package-ecosystem: "docker"
+    directory: "/silta-varnish/varnish6"
+    schedule:
+      interval: "daily"
+    ignore:
+      - dependency-name: "varnish"
+        update-types: ["version-update:semver-major"]
+  - package-ecosystem: "docker"
+    directory: "/silta-varnish/varnish7"
+    schedule:
+      interval: "daily"
+    ignore:
+      - dependency-name: "varnish"
+        update-types: ["version-update:semver-major"]

From b0a34cd1392b61a87145ce399e1b2322009c6198 Mon Sep 17 00:00:00 2001
From: Rasmus Werling <rasmus.werling@gmail.com>
Date: Tue, 11 Jun 2024 08:55:46 +0300
Subject: [PATCH 6/9] Add latest silta-cicd image to dependabot rules.

---
 .github/dependabot.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 6ec434b8..de963bbd 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,6 +1,20 @@
 version: 2
 updates:
 
+  # silta-cicd
+  - package-ecosystem: "docker"
+    directory: "/silta-cicd/circleci-php8.2-node20-composer2"
+    schedule:
+      interval: "daily"
+    ignore:
+      - dependency-name: "php"
+        update-types:
+          - "version-update:semver-major"
+          - "version-update:semver-minor"
+      - dependency-name: "node"
+        update-types:
+          - "version-update:semver-major"
+
   # silta-mailhog
   - package-ecosystem: "docker"
     directory: "/silta-mailhog/silent"

From eb28a7de7fdd650a3eb902c5c49b242972f5a782 Mon Sep 17 00:00:00 2001
From: Rasmus Werling <rasmus.werling@gmail.com>
Date: Tue, 11 Jun 2024 09:15:26 +0300
Subject: [PATCH 7/9] Fix dependency name.

---
 .github/dependabot.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index de963bbd..0cd44662 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -7,7 +7,7 @@ updates:
     schedule:
       interval: "daily"
     ignore:
-      - dependency-name: "php"
+      - dependency-name: "cimg/php"
         update-types:
           - "version-update:semver-major"
           - "version-update:semver-minor"

From 141335aaca007b47dc0f68caa8a18a3e7e274e6c Mon Sep 17 00:00:00 2001
From: Rasmus Werling <rasmus.werling@gmail.com>
Date: Tue, 11 Jun 2024 09:38:31 +0300
Subject: [PATCH 8/9] Dependabot testing.

---
 .github/dependabot.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 0cd44662..2a87cc74 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -14,6 +14,7 @@ updates:
       - dependency-name: "node"
         update-types:
           - "version-update:semver-major"
+    target-branch: "dependabot-testing"
 
   # silta-mailhog
   - package-ecosystem: "docker"

From 4da247f576551ecc355feb0aa54a74f91e287188 Mon Sep 17 00:00:00 2001
From: Rasmus Werling <rasmus.werling@gmail.com>
Date: Tue, 11 Jun 2024 13:11:24 +0300
Subject: [PATCH 9/9] Add all newer cicd images to dependabot rules.

---
 .github/dependabot.yml | 38 +++++++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 2a87cc74..ee603d3d 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -3,7 +3,7 @@ updates:
 
   # silta-cicd
   - package-ecosystem: "docker"
-    directory: "/silta-cicd/circleci-php8.2-node20-composer2"
+    directory: "/silta-cicd/circleci-php8.0-node16-composer2"
     schedule:
       interval: "daily"
     ignore:
@@ -11,10 +11,42 @@ updates:
         update-types:
           - "version-update:semver-major"
           - "version-update:semver-minor"
-      - dependency-name: "node"
+  - package-ecosystem: "docker"
+    directory: "/silta-cicd/circleci-php8.1-node16-composer2"
+    schedule:
+      interval: "daily"
+    ignore:
+      - dependency-name: "cimg/php"
         update-types:
           - "version-update:semver-major"
-    target-branch: "dependabot-testing"
+          - "version-update:semver-minor"
+  - package-ecosystem: "docker"
+    directory: "/silta-cicd/circleci-php8.1-node18-composer2"
+    schedule:
+      interval: "daily"
+    ignore:
+      - dependency-name: "cimg/php"
+        update-types:
+          - "version-update:semver-major"
+          - "version-update:semver-minor"
+  - package-ecosystem: "docker"
+    directory: "/silta-cicd/circleci-php8.2-node18-composer2"
+    schedule:
+      interval: "daily"
+    ignore:
+      - dependency-name: "cimg/php"
+        update-types:
+          - "version-update:semver-major"
+          - "version-update:semver-minor"
+  - package-ecosystem: "docker"
+    directory: "/silta-cicd/circleci-php8.2-node20-composer2"
+    schedule:
+      interval: "daily"
+    ignore:
+      - dependency-name: "cimg/php"
+        update-types:
+          - "version-update:semver-major"
+          - "version-update:semver-minor"
 
   # silta-mailhog
   - package-ecosystem: "docker"