diff --git a/.gitignore b/.gitignore index 24d34bc..8ee7c06 100644 --- a/.gitignore +++ b/.gitignore @@ -7,17 +7,27 @@ # 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 .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 417dc79..15e208e 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' @@ -23,7 +23,7 @@ services: - proxy-network app: - container_name: app + container_name: ${WPSTACK_PROJECT_NAME:-wpstack}-app image: hackeamos/wp build: context: . @@ -35,6 +35,7 @@ services: 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 +52,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} 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