From f31aa18d8263cf7dae01cf2564a3008cc3c7ecfb Mon Sep 17 00:00:00 2001
From: Edie Lemoine <edie@myparcel.nl>
Date: Thu, 19 Sep 2024 10:47:03 +0200
Subject: [PATCH] build: undo changes

---
 README.md          | 24 ------------------------
 docker-compose.yml | 37 +++++++++++++++----------------------
 2 files changed, 15 insertions(+), 46 deletions(-)

diff --git a/README.md b/README.md
index 9f9873a..18d784f 100644
--- a/README.md
+++ b/README.md
@@ -40,14 +40,6 @@ All [tags in the `prestashop/prestashop` repository](https://api.github.com/repo
 - 8.1
 - 8.2
 
-### Testing
-
-To build the image, pass the following environment variables when building:
-
-```shell
-PS_VERSION=8.1.0 PHP_VERSION=8.2 docker compose build prestashop
-```
-
 ## shopware
 
 [View on GitHub Container Registry 📦](https://ghcr.io/myparcelnl/shopware)
@@ -65,14 +57,6 @@ Shopware images based on `php-xd`.
 - 8.2
 - 8.1
 
-### Testing
-
-To build the image, pass the following environment variables when building:
-
-```shell
-SW_VERSION=6.5 PHP_VERSION=7.4 docker compose build shopware
-```
-
 ## wordpress
 
 [View on GitHub Container Registry 📦](https://ghcr.io/myparcelnl/wordpress)
@@ -89,11 +73,3 @@ All versions returned by [the WordPress API](https://api.wordpress.org/core/vers
 
 - 7.4
 - 8.2
-
-### Testing
-
-To build the image, pass the following environment variables when building:
-
-```shell
-WP_VERSION=6.5.3 PHP_VERSION=7.4 docker compose build wordpress
-```
diff --git a/docker-compose.yml b/docker-compose.yml
index 1a12fda..58c1bef 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,27 +1,20 @@
 services:
+  ###
+  # Main php container
+  #
+  # This container runs the php-fpm process and serves WordPress.
+  #
+  # Requires the db container to be running.
+  #
+  # Contains:
+  #  - php-fpm, xdebug, composer
+  #  - WordPress installation (in volume web-data)
+  #  - Various tools: zsh, vim
+  #
+  # See https://github.com/myparcelnl/docker-images/pkgs/container/wordpress
+  ##
   wordpress:
-    image: ghcr.io/myparcelnl/wordpress:${WP_VERSION}-php${PHP_VERSION}
+    image: ghcr.io/myparcelnl/wordpress:6.3-php7.4
     build:
       context: images/wordpress
       dockerfile: Dockerfile
-      args:
-        PHP_VERSION: ${PHP_VERSION}
-        WP_VERSION: ${WP_VERSION}
-
-  prestashop:
-    image: ghcr.io/myparcelnl/prestashop:${PS_VERSION}-php${PHP_VERSION}
-    build:
-      context: images/prestashop
-      dockerfile: Dockerfile
-      args:
-        PHP_VERSION: ${PHP_VERSION}
-        PS_VERSION: ${PS_VERSION}
-
-  shopware:
-    image: ghcr.io/myparcelnl/shopware:${SW_VERSION}-php${PHP_VERSION}
-    build:
-      context: images/shopware
-      dockerfile: Dockerfile
-      args:
-        PHP_VERSION: ${PHP_VERSION}
-        SW_VERSION: ${SW_VERSION}