devops: CI env vars fixed

wp-graphql · May 20, 2024 · a1d2a2a · a1d2a2a
1 parent 5a89699
commit a1d2a2a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -63,7 +63,6 @@ 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/bin/entrypoint.sh b/bin/entrypoint.sh
@@ -25,6 +25,7 @@ export WORDPRESS_DOMAIN=${WORDPRESS_DOMAIN-$( hostname -i )}
 export WORDPRESS_URL="http://$WORDPRESS_DOMAIN"
 echo "WORDPRESS_DOMAIN=$WORDPRESS_DOMAIN" > "$PROJECT_DIR/.env.docker"
 echo "WORDPRESS_URL=$WORDPRESS_URL" >> "$PROJECT_DIR/.env.docker"
+echo "WP_CORE_DIR=$WP_ROOT_FOLDER" >> "$PROJECT_DIR/.env.docker"
 
 # Config WordPress
 if [ -f "${WP_ROOT_FOLDER}/wp-config.php" ]; then

diff --git a/tests/acceptance.suite.dist.yml b/tests/acceptance.suite.dist.yml
@@ -22,9 +22,6 @@ modules:
   config:
     \Tests\WPGraphQL\Codeception\Module\WPGraphQL:
       endpoint: '%WORDPRESS_URL%/graphql'
-    \lucatume\WPBrowser\Module\WPCLI:
-      path: '%WP_ROOT_FOLDER%'
-      throw: true
     \lucatume\WPBrowser\Module\WPDb:
       dsn: 'mysql:host=%DB_HOST%;dbname=%DB_NAME%'
       user: '%DB_USER%'
@@ -38,7 +35,7 @@ modules:
       tablePrefix: '%WP_TABLE_PREFIX%'
     \lucatume\WPBrowser\Module\WPBrowser:
       url: '%WORDPRESS_URL%'
-      wpRootFolder: '%WP_CORE_DIR%'
+      wpRootFolder: '%WP_ROOT_FOLDER%'
       adminUsername: '%ADMIN_USERNAME%'
       adminPassword: '%ADMIN_PASSWORD%'
       adminPath: '/wp-admin'
@@ -47,14 +44,14 @@ modules:
       url: '%WORDPRESS_URL%'
       cookies: false
     \lucatume\WPBrowser\Module\WPFilesystem:
-      wpRootFolder: '%WP_CORE_DIR%'
+      wpRootFolder: '%WP_ROOT_FOLDER%'
       plugins: '/wp-content/plugins'
       mu-plugins: '/wp-content/mu-plugins'
       themes: '/wp-content/themes'
       uploads: '/wp-content/uploads'
     \lucatume\WPBrowser\Module\WPLoader:
       loadOnly: true
-      wpRootFolder: '%WP_CORE_DIR%'
+      wpRootFolder: '%WP_ROOT_FOLDER%'
       dbUrl: 'mysql://%DB_USER%:%DB_PASSWORD%@%DB_HOST%:%DB_PORT%/%DB_NAME%'
       domain: '%WORDPRESS_DOMAIN%'
       # plugins:

diff --git a/tests/functional.suite.dist.yml b/tests/functional.suite.dist.yml
@@ -20,9 +20,6 @@ modules:
   config:
     \Tests\WPGraphQL\Codeception\Module\WPGraphQL:
       endpoint: '%WORDPRESS_URL%/graphql'
-    \lucatume\WPBrowser\Module\WPCLI:
-      path: '%WP_ROOT_FOLDER%'
-      throw: true
     \lucatume\WPBrowser\Module\WPDb:
       dsn: 'mysql:host=%DB_HOST%;dbname=%DB_NAME%'
       user: '%DB_USER%'
@@ -36,7 +33,7 @@ modules:
       tablePrefix: '%WP_TABLE_PREFIX%'
     \lucatume\WPBrowser\Module\WPBrowser:
       url: '%WORDPRESS_URL%'
-      wpRootFolder: '%WP_CORE_DIR%'
+      wpRootFolder: '%WP_ROOT_FOLDER%'
       adminUsername: '%ADMIN_USERNAME%'
       adminPassword: '%ADMIN_PASSWORD%'
       adminPath: '/wp-admin'
@@ -45,14 +42,14 @@ modules:
       url: '%WORDPRESS_URL%'
       cookies: false
     \lucatume\WPBrowser\Module\WPFilesystem:
-      wpRootFolder: '%WP_CORE_DIR%'
+      wpRootFolder: '%WP_ROOT_FOLDER%'
       plugins: '/wp-content/plugins'
       mu-plugins: '/wp-content/mu-plugins'
       themes: '/wp-content/themes'
       uploads: '/wp-content/uploads'
     \lucatume\WPBrowser\Module\WPLoader:
       loadOnly: true
-      wpRootFolder: '%WP_CORE_DIR%'
+      wpRootFolder: '%WP_ROOT_FOLDER%'
       dbUrl: 'mysql://%DB_USER%:%DB_PASSWORD%@%DB_HOST%:%DB_PORT%/%DB_NAME%'
       domain: '%WORDPRESS_DOMAIN%'
       configFile: 'tests/_data/e2e-config.php'