From 4562bbe9c577d5d5af24afeb0c4233736bce834b Mon Sep 17 00:00:00 2001 From: Lucilio Correia Date: Thu, 23 Apr 2026 19:20:22 -0300 Subject: [PATCH 1/4] fix: default theme name --- .../scripts/docker-entrypoint.d/10-install-wordpress-unpriv.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/wordpress/scripts/docker-entrypoint.d/10-install-wordpress-unpriv.sh b/docker/wordpress/scripts/docker-entrypoint.d/10-install-wordpress-unpriv.sh index 7824412..61438b7 100644 --- a/docker/wordpress/scripts/docker-entrypoint.d/10-install-wordpress-unpriv.sh +++ b/docker/wordpress/scripts/docker-entrypoint.d/10-install-wordpress-unpriv.sh @@ -23,5 +23,5 @@ if which wp && ! wp core is-installed; then fi if test "$(wp theme list --format=count)" = "0"; then - wp theme install ${WORDPRESS_DEFAULT_THEME:-twentytwentysix} --force --activate; + wp theme install ${WORDPRESS_DEFAULT_THEME:-twentytwentyfive} --force --activate; fi \ No newline at end of file -- 2.52.0 From d0168d7b7d43135570bedb67e62a358e1bc12ff7 Mon Sep 17 00:00:00 2001 From: Lucilio Correia Date: Thu, 23 Apr 2026 19:21:04 -0300 Subject: [PATCH 2/4] fix: composite container names avoiding conflicts --- docker-compose.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 417dc79..9a99090 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ name: ${WPSTACK_PROJECT_NAME:-wpstack} services: reverse-proxy: - container_name: reverse-proxy + container_name: ${WPSTACK_PROJECT_NAME:-wpstack}-reverse-proxy image: hackeamos/httpd build: context: './docker/nginx' @@ -11,6 +11,8 @@ services: - app volumes: - ./webroot:/var/www/html + - ../repo/wp-content/themes/itforumportal:/var/www/html/wp-content/themes/itforumportal + - ../repo/wp-content/plugins/advanced-custom-fields-pro:/var/www/html/wp-content/plugins/advanced-custom-fields-pro environment: WORDPRESS_SITEURL: ${WPSTACK_PROTOCOL}://${WPSTACK_DOMAIN}/${WPSTACK_URLPATH:-} WORDPRESS_SITE_TYPE: ${WPSTACK_MULTISITE:-regular} @@ -23,18 +25,21 @@ services: - proxy-network app: - container_name: app + container_name: ${WPSTACK_PROJECT_NAME:-wpstack}-app image: hackeamos/wp build: context: . dockerfile: ./docker/wordpress/Dockerfile volumes: - ./webroot:/var/www/html + - ../repo/wp-content/themes/itforumportal:/var/www/html/wp-content/themes/itforumportal + - ../repo/wp-content/plugins/advanced-custom-fields-pro:/var/www/html/wp-content/plugins/advanced-custom-fields-pro environment: WORDPRESS_DB_HOST: db WORDPRESS_DB_USER: ${DB_USER} WORDPRESS_DB_NAME: ${DB_NAME} WORDPRESS_DB_PASSWORD: ${DB_PASS} + WORDPRESS_TABLE_PREFIX: ${DB_PREFIX:-wp_} WORDPRESS_SITEURL: ${WPSTACK_PROTOCOL}://${WPSTACK_DOMAIN}/${WPSTACK_URLPATH:-} WORDPRESS_BLOGNAME: ${WPSTACK_BLOGNAME:-} WORDPRESS_ADMIN_USER: ${WPSTACK_ADMIN_USER:-admin} @@ -51,10 +56,11 @@ services: - proxy-network db: - container_name: db + container_name: ${WPSTACK_PROJECT_NAME:-wpstack}-db image: mariadb volumes: - db_data:/var/lib/mysql + - ../db:/docker-entrypoint-initdb.d environment: MARIADB_RANDOM_ROOT_PASSWORD: true MARIADB_USER: ${DB_USER} -- 2.52.0 From b7c8c0f9c92a81b590c21c2e56e9672f4a99f876 Mon Sep 17 00:00:00 2001 From: Lucilio Correia Date: Thu, 23 Apr 2026 19:48:00 -0300 Subject: [PATCH 3/4] fix: do not track plugins and themes except if explicitly cleared on .gitignore --- .gitignore | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 24d34bc..72b1975 100644 --- a/.gitignore +++ b/.gitignore @@ -7,14 +7,23 @@ # ignora tudo dentro de wp-content /webroot/wp-content/* -# permite o que é seu +# permite as pastas (mas não o conteúdo delas) !/webroot/wp-content/plugins/ !/webroot/wp-content/themes/ !/webroot/wp-content/mu-plugins/ -# permite arquivos específicos se precisar -!/webroot/wp-content/plugins/seu-plugin/ -!/webroot/wp-content/themes/seu-tema/ +/webroot/wp-content/plugins/* +/webroot/wp-content/themes/* +/webroot/wp-content/mu-plugins/* + +# permite o .gitkeep para que a pasta vazia seja versionada +!/webroot/wp-content/plugins/.gitkeep +!/webroot/wp-content/themes/.gitkeep +!/webroot/wp-content/mu-plugins/.gitkeep + +# se no futuro quiser versionar algo específico: +# !/webroot/wp-content/themes/seu-tema/ +# !/webroot/wp-content/themes/seu-tema/** # regras gerais .DS_Store -- 2.52.0 From a1a32bb636dbf023d886d9a5ca9826fda886fcab Mon Sep 17 00:00:00 2001 From: Lucilio Correia Date: Thu, 23 Apr 2026 21:03:58 -0300 Subject: [PATCH 4/4] feature: move bind folders for untracked docker-compose.override --- .gitignore | 3 ++- docker-compose.override-sample.yml | 15 +++++++++++++++ docker-compose.yml | 4 ---- 3 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 docker-compose.override-sample.yml diff --git a/.gitignore b/.gitignore index 72b1975..8ee7c06 100644 --- a/.gitignore +++ b/.gitignore @@ -29,4 +29,5 @@ .DS_Store .env vendor -node_modules \ No newline at end of file +node_modules +docker-compose.override.yml \ No newline at end of file diff --git a/docker-compose.override-sample.yml b/docker-compose.override-sample.yml new file mode 100644 index 0000000..cbeede6 --- /dev/null +++ b/docker-compose.override-sample.yml @@ -0,0 +1,15 @@ +# +# uncoment volumes below to bind specif plugins and themes from other paths into your project +# copy this file as 'docker-compose.override.yml' for autoloading with docker-compose.yml +# +services: + + reverse-proxy: +# volumes: +# - ../repo/wp-content/themes/my-theme:/var/www/html/wp-content/themes/my-theme +# - ../repo/wp-content/plugins/my-plugin:/var/www/html/wp-content/plugins/my-plugin + + app: +# volumes: +# - ../repo/wp-content/themes/my-theme:/var/www/html/wp-content/themes/my-theme +# - ../repo/wp-content/plugins/my-plugin:/var/www/html/wp-content/plugins/my-plugin diff --git a/docker-compose.yml b/docker-compose.yml index 9a99090..15e208e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,8 +11,6 @@ services: - app volumes: - ./webroot:/var/www/html - - ../repo/wp-content/themes/itforumportal:/var/www/html/wp-content/themes/itforumportal - - ../repo/wp-content/plugins/advanced-custom-fields-pro:/var/www/html/wp-content/plugins/advanced-custom-fields-pro environment: WORDPRESS_SITEURL: ${WPSTACK_PROTOCOL}://${WPSTACK_DOMAIN}/${WPSTACK_URLPATH:-} WORDPRESS_SITE_TYPE: ${WPSTACK_MULTISITE:-regular} @@ -32,8 +30,6 @@ services: dockerfile: ./docker/wordpress/Dockerfile volumes: - ./webroot:/var/www/html - - ../repo/wp-content/themes/itforumportal:/var/www/html/wp-content/themes/itforumportal - - ../repo/wp-content/plugins/advanced-custom-fields-pro:/var/www/html/wp-content/plugins/advanced-custom-fields-pro environment: WORDPRESS_DB_HOST: db WORDPRESS_DB_USER: ${DB_USER} -- 2.52.0