bump script, update base image to WP v6

Author: joemaller

Dockerfile

@@ -3,7 +3,7 @@
 # This version is automatically updated by the wordpress:bump script
 # but can also be manually updated for tagged betas and release candidates
 # Manual updates also must change wp-version.json
-FROM wordpress:beta-6.0-RC1-php8.0-apache
+FROM wordpress:6.0-php8.0-apache
 
 LABEL version="0.10.4"
 

README.md

@@ -2,7 +2,7 @@
 
 <h4> 
 Version 0.10.4
-- WordPress beta-6.0-RC1
+<!-- WPVERSION -->- WordPress 6.0
 </h4>
 
 [![dockeri.co](https://dockeri.co/image/ideasonpurpose/wordpress)](https://hub.docker.com/r/ideasonpurpose/wordpress)<br>
@@ -12,7 +12,7 @@ Version 0.10.4
 
 This project provides local development environments for fast iteration of existing WordPress websites. This includes pre-configured Docker-based MySQL and PHP servers, our [Docker-Build toolchain][docker-build], [Xdebug](https://xdebug.org/), [ImageMagick](http://www.imagemagick.org/) and a number of helper scripts.
 
-The project builds on the official WordPress docker image, currently **[v6.0-RC1](https://hub.docker.com/_/wordpress)**
+The project builds on the official WordPress docker image, currently **[v6.0](https://hub.docker.com/_/wordpress)**
 
 ## Getting Started
 
@@ -167,6 +167,12 @@ npm run wp-cli wp core update https://wordpress.org/wordpress-5.8.1-RC1.zip
 
 Versions can be rolled back by removing the docker `*_wp` volume.
 
+#### Bumping Image Versions
+
+The `npm run bump` script will query the WordPress releases API and DockerHub, then update the docker image and readme to the latest WordPress image.
+
+To update to a pre-release image, enter a valid DockerHub tag into the wp-version.json file.
+
 ### Plugin Development
 
 Projects often rely on plugins which are developed in parallel. Two placeholder environment variables can be used to directly mount plugins into the WordPress environment. This enables better version control and dependency management since the nested and .gitignored **wp-content/plugins** directory often conflicts with the parent theme.

bin/bump-wordpress.sh

@@ -56,8 +56,8 @@ echo -e "✏️   Updating ${GOLD}Dockerfile${RESET} to ${CYAN}wordpress:${WP_LA
 sed -i "s/wordpress:.*-php8/wordpress:${WP_LATEST}-php8/" /app/Dockerfile
 
 echo -e "✏️   Updating ${GOLD}README.md${RESET} to ${CYAN}v${WP_LATEST}${RESET}"
-sed -E -i "s/currently\s+\*\*\[v[0-9.]+\]/currently **[v${WP_LATEST}]/" /app/README.md
-sed -E -i "s/WordPress\s+[0-9.]+/WordPress ${WP_LATEST}/" /app/README.md
+sed -E -i "s/currently\s+\*\*\[v[^\\]+\]/currently **[v${WP_LATEST}]/" /app/README.md
+sed -E -i "s/^<\!-- WPVERSION -->- WordPress.+$/<\!-- WPVERSION -->- WordPress ${WP_LATEST}/" /app/README.md
 
 echo -e "✏️   Updating ${GOLD}docker-compose.yml${RESET} (boilerplate) to ${CYAN}wordpress:${WP_LATEST}${RESET}"
 sed -E -i "s/ideasonpurpose\/wordpress:[0-9.]+/ideasonpurpose\/wordpress:${WP_LATEST}/" /app/boilerplate-tooling/docker-compose.yml

boilerplate-tooling/docker-compose.yml

@@ -26,7 +26,7 @@ services:
     depends_on:
       - db
     # image: ideasonpurpose/wordpress:dev
-    image: ideasonpurpose/wordpress:5.9.3
+    image: ideasonpurpose/wordpress:6.0
     restart: always
     volumes:
       - wp_data:/var/www/html
@@ -74,7 +74,7 @@ services:
       - db
       - wordpress
     # image: ideasonpurpose/wordpress:dev
-    image: ideasonpurpose/wordpress:5.9.3
+    image: ideasonpurpose/wordpress:6.0
     profiles: ["utility"]
     user: www-data
     volumes:
@@ -234,7 +234,7 @@ services:
   # Project info: https://github.com/ideasonpurpose/docker-wordpress-dev
   repair-permissions:
     # image: ideasonpurpose/wordpress:dev
-    image: ideasonpurpose/wordpress:5.9.3
+    image: ideasonpurpose/wordpress:6.0
     profiles: ["utility"]
     volumes:
       - .:/usr/src/site
@@ -248,7 +248,7 @@ services:
   # Project info: https://github.com/ideasonpurpose/docker-wordpress-dev
   pull:
     # image: ideasonpurpose/wordpress:dev
-    image: ideasonpurpose/wordpress:5.9.3
+    image: ideasonpurpose/wordpress:6.0
     profiles: ["utility"]
     volumes:
       - .:/usr/src/site

wp-version.json

@@ -1,3 +1,3 @@
 {
-  "wordpress": "beta-6.0-RC1"
+  "wordpress": "6.0"
 }