devops: More docker config changes

wp-graphql · May 20, 2024 · 8ca36a0 · 8ca36a0
1 parent 28d1e2a
commit 8ca36a0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -63,6 +63,7 @@ RUN service apache2 restart
 
 # Set project environmental variables
 ENV WP_ROOT_FOLDER="/var/www/html"
+ENV WP_CORE_DIR=${WP_ROOT_FOLDER}
 ENV WORDPRESS_DB_HOST=${DB_HOST}
 ENV WORDPRESS_DB_PORT=${DB_PORT}
 ENV WORDPRESS_DB_USER=${DB_USER}

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -53,7 +53,6 @@ services:
       - ./local/db:/docker-entrypoint-initdb.d
     command: --default-authentication-plugin=mysql_native_password
     environment:
-      WP_CORE_DIR: /var/www/html
       MYSQL_ROOT_PASSWORD: ${ROOT_PASSWORD:-password}
       MYSQL_DATABASE: ${DB_NAME:-wordpress}
       MYSQL_USER: ${DB_USER:-wordpress}
@@ -81,7 +80,6 @@ services:
       - ./.log/run_tests:/var/log/apache2
     env_file: .env.testing
     environment:
-      WP_CORE_DIR: /var/www/html
       RUNNING_TEST_STANDALONE: 1
       GRAPHQL_DEBUG: 1
       WPGRAPHQL_WOOCOMMERCE_AUTOLOAD: 1