Merge pull request #73 from bcgov/feature/descw-2689-update-deploy-im…

…ages

DESCW-2689 Update nginx, mariadb, and wordpress images

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
+### November 1, 2024
+- update images ([DESCW-2689](https://citz-gdx.atlassian.net/browse/DESCW-2689))
+  - update WordPress deploy image  wordpress:6.4.2-php8.3-fpm-alpine - wordpress:6.6.2-php8.3-fpm-alpine
+  - update Nginx deploy image 1.25.3 - 1.26.2
+  - update alpine deploy image 3.18.4 - 3.20.3 (mariadb v)
 ### May 2, 2024
-- Integrate reusable unit tests by adding resulable functionality to test commands. ([DESCW-2664](https://apps.itsm.gov.bc.ca/jira/browse/DESCW-2664))
+- Integrate reusable unit tests by adding resulable functionality to test commands. ([DESCW-2664](https://citz-gdx.atlassian.net/browse/DESCW-2664))
 - 
 ## May 31, 2024
 - Updated dev deployment to allow WordPress unit tests to be run inside the PHP Wordpress container.

deployments/kustomize/image-builds/mariadb-build.yaml

@@ -20,7 +20,7 @@ spec:
     dockerStrategy:
       from:
           kind: DockerImage
-          name: alpine:3.18.4
+          name: alpine:3.20.3
       type: Docker
   successfulBuildsHistoryLimit: 2
   failedBuildsHistoryLimit: 2

deployments/kustomize/image-builds/nginx-build.yaml

@@ -26,7 +26,7 @@ spec:
     dockerStrategy:
       from:
           kind: DockerImage
-          name: nginx:1.25.3
+          name: nginx:1.26.2
       type: Docker
   output:
     to:

deployments/kustomize/image-builds/wordpress-build.yaml

@@ -26,7 +26,7 @@ spec:
     dockerStrategy:
       from:
         kind: DockerImage
-        name: wordpress:6.4.2-php8.3-fpm-alpine
+        name: wordpress:6.6.2-php8.3-fpm-alpine
     type: Docker
   source:
     type: Git

openshift/templates/images/README.md

@@ -74,8 +74,8 @@ Use the convention [product]-[service component]-run:tag. For example:
 
 | Image | Version | Description |
 | ----- | ------- | ----------- |
-| alpine | 3.18.4 | Base Alpine linux |
-| mariadb | 10.6.8-r0 | MariaDB version that gets build in base-images via Dockerfile. Dependent on the [Alpine version](https://pkgs.alpinelinux.org/packages?name=mariadb&branch=v3.18): |
-| nginx | 1.23.1-alpine | Nginx web server, used to serve WordPress / PHP |
-| wordpress | 6.3.1-php8.0-fpm-alpine | PHP-FPM for WordPress 7.4 no longer supported by WordPress docker image|
+| alpine | 3.20.3 | Base Alpine linux |
+| mariadb | 10.11.8-r0 | MariaDB version that gets build in base-images via Dockerfile. Dependent on the [Alpine version](https://pkgs.alpinelinux.org/packages?name=mariadb&branch=v3.20&repo=&arch=x86_64&origin=&flagged=&maintainer=): |
+| nginx | 1.26.2-alpine | Nginx web server, used to serve WordPress / PHP |
+| wordpress | wordpress:6.4.2-php8.3-fpm-alpine | PHP-FPM for WordPress 7.4 no longer supported by WordPress docker image|
 | ubuntu | 22.04| Used for the sidecar |

openshift/templates/images/mariadb/docker/Dockerfile

@@ -1,5 +1,5 @@
 # OpenShift uses version from buildconfig - Don't update
-FROM alpine:3.18
+FROM alpine:3.20
 
 # https://github.com/opencontainers/image-spec/blob/master/annotations.md
 ARG BUILD_DATE
@@ -17,7 +17,7 @@ LABEL org.opencontainers.image.created=$BUILD_DATE \
 
 SHELL ["/bin/ash", "-euo", "pipefail", "-c"]
 
-# Mariadb versions are here: https://pkgs.alpinelinux.org/packages?name=mariadb&branch=v3.18
+# Mariadb versions are here: https://pkgs.alpinelinux.org/packages?name=mariadb&branch=v3.20&repo=&arch=x86_64&origin=&flagged=&maintainer=
 RUN \
   apk add --no-cache mariadb && \
   TO_KEEP=$(echo " \