diff --git a/backend.dockerfile b/backend.dockerfile index 6d45c8a..117b1e0 100644 --- a/backend.dockerfile +++ b/backend.dockerfile @@ -17,10 +17,9 @@ ARG WP_LOGGED_IN_SALT ARG WP_NONCE_SALT ARG WP_JWT_AUTH_SECRET_KEY -ENV WP_ENV development +ENV WP_ENV ${WP_ENV} ENV WP_HOME ${API_URL} -ENV MYSQL_HOST db ENV MYSQL_DATABASE ${MYSQL_DATABASE} ENV MYSQL_USER ${MYSQL_USER} ENV MYSQL_PASSWORD ${MYSQL_PASSWORD} diff --git a/backend/config/application.php b/backend/config/application.php index eaead34..53daba9 100644 --- a/backend/config/application.php +++ b/backend/config/application.php @@ -43,7 +43,7 @@ define('VP_PROJECT_ROOT', $webroot_dir . '/wp/'); define('DB_NAME', env('MYSQL_DATABASE')); define('DB_USER', env('MYSQL_USER')); define('DB_PASSWORD', env('MYSQL_PASSWORD')); -define('DB_HOST', env('MYSQL_HOST') ?: 'localhost'); +define('DB_HOST', env('WP_DB_HOST') ?: 'db'); define('DB_CHARSET', 'utf8mb4'); define('DB_COLLATE', ''); $table_prefix = env('DB_PREFIX') ?: 'wp_'; diff --git a/docker/php/setup.sh b/docker/php/setup.sh index 65baaed..d4502a5 100644 --- a/docker/php/setup.sh +++ b/docker/php/setup.sh @@ -9,7 +9,7 @@ done echo "Ready...." # Apply core database updates if needed -wp core update-db +wp core update-db --allow-root # Activate plugins in desired order # (if plugin is already activated command will do nothing) diff --git a/environment.env b/environment.env index 43517d9..51705ee 100644 --- a/environment.env +++ b/environment.env @@ -5,21 +5,20 @@ MYSQL_USER=wp_admin MYSQL_PASSWORD=wp_password -MYSQL_HOST=localhost - -API_URL=http://localhost:8081 +API_URL=url #Wordpress config -ENV=local -WP_HOME=${API_URL} -- for local wordpress development only +WP_ENV=development -- set this to local only for local wordpress development (it will activate script debug and query save) +WP_DB_HOST=localhost -- for local wordpress development only to override default db if needed +WP_HOME=${API_URL} -- for local wordpress development since dotenv allows this kind of initialization -AUTH_KEY='6Ln?uZEt?OO-}q*YuU]K*^`C2s2lW,_o${e:t~LZ]b!2n8knYwjAsRzB5`|8IM-#d/kv+#V-1900e1ia2M \ No newline at end of file +JWT_AUTH_SECRET_KEY=generate_me \ No newline at end of file