Change run configuration (#56)

* Replace wp-env with docker-compose

* Ommit cli version

* Name stack tinify

* Change 60 74

* Use dockerfiles to select build version

* Use external network when running in github action

* replace override

* Update lock file

* Use aliasses

* Check for install

* Wait for wordpress to be ready

* Set env for per variation composer project

* Add healthcheck for database

* use playwright directly

* Change check on playwright version

* Change run cmds

* Use correct images

* Add network name to allow mock to connect

* Remove force click

* Add port to localstack

* Pick specifically 4.6

* Use non-https

* Skip salts

* Wait for selectors to appear (due to js)

* await clickers

* Remove wordpress-scripts

* Remove images in favor of a conf map

* use ge

* Change wp version check

Author: tijmenbruggeman

bin/run-wordpress

@@ -3,6 +3,8 @@
 # Usage: bin/run-wordpress [WORDPRESS_VERSION] [PHP_VERSION]
 # Example: bin/run-wordpress 67 82
 
+CONFIG_FILE="config/wp-version.conf"
+
 # Ensure Docker CLI is installed.
 if ! command -v docker >/dev/null; then
   echo "Docker CLI is required."
@@ -12,16 +14,25 @@ fi
 WORDPRESS_VERSION_ENV="${1:-$WORDPRESS_VERSION}"
 PHP_VERSION_ENV="${2:-$PHP_VERSION}"
 
+WP_IMAGE_KEY="${WORDPRESS_VERSION_ENV}_${PHP_VERSION_ENV}"
+WP_IMAGE=$(grep "^${WP_IMAGE_KEY}=" "$CONFIG_FILE" | cut -d'=' -f2)
+WORDPRESS_PORT="80${WORDPRESS_VERSION_ENV}"
+
+if [ -z "$WP_IMAGE" ]; then
+  echo "Unsupported version combination: $WP_IMAGE_KEY"
+  exit 1
+fi
+
 # Parse WordPress version parameter
 if [[ "$WORDPRESS_VERSION_ENV" =~ ^[0-9]{2}$ ]]; then
   WORDPRESS_VERSION="${WORDPRESS_VERSION_ENV:0:1}.${WORDPRESS_VERSION_ENV:1:1}"
 else
   WORDPRESS_VERSION="$WORDPRESS_VERSION_ENV"
 fi
 
-# Exports as 8.2
 export WORDPRESS_VERSION 
 export WORDPRESS_VERSION_ENV
+export WP_IMAGE
 
 # Parse WordPress version parameter
 if [[ "$PHP_VERSION_ENV" =~ ^[0-9]{2}$ ]]; then
@@ -33,20 +44,10 @@ fi
 export PHP_VERSION
 export PHP_VERSION_ENV
 
-: "${WORDPRESS_VERSION_ENV:=latest}"    # default WordPress version shorthand
-: "${PHP_VERSION_ENV:=8.0}"             # default PHP version shorthand
-
-: "${WORDPRESS_PORT:=80${WORDPRESS_VERSION_ENV}}"
 export WORDPRESS_PORT
 
 export COMPOSE_PROJECT_NAME="tinify_${WORDPRESS_VERSION_ENV}_${PHP_VERSION_ENV}"
 
-DOCKERFILE_PATH="./config/docker/${WORDPRESS_VERSION_ENV}-${PHP_VERSION_ENV}.Dockerfile"
-if [ ! -f "$DOCKERFILE_PATH" ]; then
-  echo "No Docker file available: $DOCKERFILE_PATH"
-  exit 1
-fi
-
 echo "Starting Docker environment with WordPress $WORDPRESS_VERSION and PHP $PHP_VERSION..."
 docker compose -f config/docker-compose.yml up -d
 

bin/stop-wordpress

@@ -8,6 +8,9 @@ export WORDPRESS_VERSION_ENV
 PHP_VERSION_ENV="${2:-$PHP_VERSION}"
 export PHP_VERSION_ENV
 
+WP_IMAGE=""
+export WP_IMAGE
+
 export COMPOSE_PROJECT_NAME="tinify_${WORDPRESS_VERSION_ENV}_${PHP_VERSION_ENV}"
 
 docker compose -f config/docker-compose.yml down -v

config/docker-compose.yml

@@ -22,8 +22,7 @@ services:
   wordpress:
     depends_on:
       - db
-    build:
-      dockerfile: docker/${WORDPRESS_VERSION_ENV}-${PHP_VERSION_ENV}.Dockerfile
+    image: ${WP_IMAGE}
     environment:
       WORDPRESS_DB_HOST: db:3306
       WORDPRESS_DB_USER: wordpress

config/wp-version.conf

@@ -0,0 +1,8 @@
+# Format: WPVERSION_PHPVERSION=DOCKER_IMAGE
+46_56=wordpress:4.6-php5.6-apache
+46_70=wordpress:4.6-php7.0-apache
+57_73=wordpress:5.7-php7.3-apache
+60_74=wordpress:6.0-php7.4-apache
+63_80=wordpress:6.3-php8.0-apache
+67_82=wordpress:6.7-php8.2-apache
+68_83=wordpress:6.8-php8.3-apache