diff --git a/blueprints/wordpress/docker-compose.yml b/blueprints/wordpress/docker-compose.yml index f2fc4d9a..855bacc4 100644 --- a/blueprints/wordpress/docker-compose.yml +++ b/blueprints/wordpress/docker-compose.yml @@ -1,25 +1,34 @@ -version: "3.8" services: wordpress: - image: wordpress:6.7.1 - environment: - WORDPRESS_DB_HOST: db - WORDPRESS_DB_USER: exampleuser - WORDPRESS_DB_PASSWORD: examplepass - WORDPRESS_DB_NAME: exampledb + image: wordpress:latest volumes: - - wordpress_data:/var/www/html + - ./wp-app:/var/www/html + - ../files/uploads.ini:/usr/local/etc/php/conf.d/uploads.ini + environment: + WORDPRESS_DB_HOST: wp_db + WORDPRESS_DB_NAME: $DB_NAME + WORDPRESS_DB_USER: root + WORDPRESS_DB_PASSWORD: $DB_PASSWORD + WORDPRESS_DEBUG: ${WORDPRESS_DEBUG:-0} + depends_on: + wp_db: + condition: service_healthy + restart: unless-stopped - db: - image: mysql:5.7.34 - environment: - MYSQL_DATABASE: exampledb - MYSQL_USER: exampleuser - MYSQL_PASSWORD: examplepass - MYSQL_ROOT_PASSWORD: rootpass + wp_db: + image: mysql:8.4 + restart: unless-stopped volumes: - - db_data:/var/lib/mysql + - wp_data:/var/lib/mysql + environment: + MYSQL_ROOT_PASSWORD: $DB_PASSWORD + MYSQL_DATABASE: $DB_NAME + healthcheck: + test: ["CMD-SHELL", "exit | mysql -h localhost -P 3306 -u root -p$$MYSQL_ROOT_PASSWORD"] + interval: 10s + timeout: 5s + retries: 5 + start_period: 30s volumes: - wordpress_data: - db_data: + wp_data: \ No newline at end of file diff --git a/blueprints/wordpress/template.toml b/blueprints/wordpress/template.toml index 906960d3..91d95e9c 100644 --- a/blueprints/wordpress/template.toml +++ b/blueprints/wordpress/template.toml @@ -1,11 +1,27 @@ [variables] main_domain = "${domain}" +db_name = "wordpress" +db_user = "wordpress" +db_password = "${password:32}" [config] -env = {} -mounts = [] +env = [ + "WORDPRESS_DEBUG=0", + "DB_NAME=${db_name}", + "DB_USER=${db_user}", + "DB_PASSWORD=${db_password}" +] [[config.domains]] serviceName = "wordpress" port = 80 host = "${main_domain}" + +[[config.mounts]] +filePath = "uploads.ini" +content = """upload_max_filesize = 64M +post_max_size = 64M +memory_limit = 256M +max_execution_time = 300 +max_input_vars = 3000 +""" \ No newline at end of file diff --git a/meta.json b/meta.json index 1784aa8e..2ef21caf 100644 --- a/meta.json +++ b/meta.json @@ -316,7 +316,7 @@ { "id": "wordpress", "name": "Wordpress", - "version": "6.7.1", + "version": "latest", "description": "Wordpress is a free and open source content management system (CMS) for publishing and managing websites.", "logo": "wordpress.png", "links": {