diff --git a/Config/WordpressExample/docker-compose.main.yml b/Config/WordpressExample/docker-compose.main.yml index 74f70c0..d0d0130 100644 --- a/Config/WordpressExample/docker-compose.main.yml +++ b/Config/WordpressExample/docker-compose.main.yml @@ -1,6 +1,8 @@ # 2025-10-17 Hyperling # Copied and modified from the example here: # https://hub.docker.com/_/wordpress +# This file should be copied to `docker-compose.yml`. +# Most configration changes can be done in the env file rather than here. ## TBDs ## # - Move env variables to env.example @@ -8,6 +10,11 @@ # - Add CPU and MEM section # - Change ports +# TBD locate these at ../../Volumes and create `prep.sh` script. +volumes: + wordpress: + db: + services: wp-app: @@ -16,25 +23,36 @@ services: ports: - 8080:80 environment: - WORDPRESS_DB_HOST: db - WORDPRESS_DB_USER: exampleuser - WORDPRESS_DB_PASSWORD: examplepass - WORDPRESS_DB_NAME: exampledb + WORDPRESS_DB_HOST: wp-db + WORDPRESS_DB_USER: $WORDPRESS_DB_USER + WORDPRESS_DB_PASSWORD: $WORDPRESS_DB_PASSWORD + WORDPRESS_DB_NAME: $WORDPRESS_DB_NAME + WP_CPU: $WP_CPU + WP_MEM: $WP_MEM volumes: - wordpress:/var/www/html + deploy: + mode: global + resources: + limits: + cpus: $WP_CPU + memory: $WP_MEM wp-db: image: mysql:8.0 restart: always environment: - MYSQL_DATABASE: exampledb - MYSQL_USER: exampleuser - MYSQL_PASSWORD: examplepass + MYSQL_DATABASE: $WORDPRESS_DB_NAME + MYSQL_USER: $WORDPRESS_DB_USER + MYSQL_PASSWORD: WORDPRESS_DB_PASSWORD MYSQL_RANDOM_ROOT_PASSWORD: '1' + WP_CPU_DB: $WP_CPU_DB + WP_MEM_DB: $WP_MEM_DB volumes: - db:/var/lib/mysql - -# TBD locate these at ../../Volumes -volumes: - wordpress: - db: + deploy: + mode: global + resources: + limits: + cpus: $WP_CPU_DB + memory: $WP_MEM_DB