Merge pull request #83 from bcgov/feature/descw-3022-update-dependency-WP-WPCLI-NGINX

Feature/descw 3022 update dependency wp wpcli nginx

Author: ShawnTurple

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+### May 16, 2025
+- ([DESCW-3022](https://citz-gdx.atlassian.net/browse/DESCW-3022))
+  - update WordPress from 6.7.1 - 6.8.1
+  - update WordPress CLI from 2.7.1 -> 2.12.0
+  - update Nginx from 1.26.2 -> 1.27.5
+
 ### April 4, 2025
 - improve workflow for wp-cli container ([DESCW-2977](https://citz-gdx.atlassian.net/browse/DESCW-2977))
 

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

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

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

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

openshift/templates/images/README.md

@@ -34,6 +34,9 @@ Base images are images that would use dockerhub image streams to create an addit
 * Creates Sidecar image used for WordPress maintenance and diagnostics.
 * ubuntu -> wordpress-sidecar
   * `oc process -f openshift/templates/images/sidecar/build.yaml | oc apply -f -`
+#### Build Locally
+* `docker build -t wordpress-sidecar-run:dev -f openshift/templates/images/sidecar/docker/Dockerfile openshift/templates/images/sidecar/docker`
+* verify image `docker run -it wordpress-sidecar-run:dev wp --version --allow-root`
 
 ## Naming Conventions
 ### Base Images

openshift/templates/images/sidecar/docker/Dockerfile

@@ -1,5 +1,5 @@
 # OpenShift uses version from buildconfig - Don't update
-FROM ubuntu:latest
+FROM ubuntu:22.04
 
 ARG CHANGE_USER=0
 
@@ -40,18 +40,18 @@ RUN set -ex; \
 	# Fix up dpkg to run in a baby-root environment. (Needed for some apt packages).
 	mv /usr/bin/dpkg /usr/bin/ddpkg ; \
 	echo '#!/bin/bash\n/usr/bin/ddpkg --force-not-root "$@"\n' > /usr/bin/dpkg ; \
-	chmod +x /usr/bin/dpkg ; \
+	chmod +x /usr/bin/dpkg ;
+RUN set -ex; \	
 	# Install WP-CLI
-	curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar ; \
+	curl -L -o ./wp-cli.phar  https://github.com/wp-cli/wp-cli/releases/download/v2.12.0/wp-cli-2.12.0.phar ; \
 	chmod +x wp-cli.phar ; \
-	mv wp-cli.phar /usr/local/bin/wp ; \
-	\
+	mv wp-cli.phar /usr/local/bin/wp ;
 	# Make a nice git-enabled shell prompt.
 	#echo "source /usr/local/bin/git-prompt.sh\nexport PS1='\n\[\e[1;32m\]\u\[\e[0;39m\]@\[\e[1;36m\]\h\[\e[0;39m\]:\[\e[1;33m\]\w\[\e[0;39m\]\[\e[1;35m\]\$(__git_ps1 \" (%s)\")\[\e[0;39m\] \[\e[0;39m\]\n$ '\n" >> /home/sidecar/.bashrc ; \
 	#curl -O https://raw.githubusercontent.com/git/git/master/contrib/completion/git-prompt.sh ; \
 	#chmod +x git-prompt.sh ; \
 	#mv git-prompt.sh /usr/local/bin/git-prompt.sh ; \
-	\
+RUN set -ex; \
 	# Replace the garbage dash interactive shell with bash when an interactive shell is opened, cleaning up the garbage shell when bash is done.
 	echo '/bin/bash --login && exit\n' >> /home/sidecar/.shinit ; \
 	# Make a shell prompt that is kinder to maintenance folk, more informative than "$".