Merge pull request #2042 from Automattic/bnu-container-type-env-vars

Add environment variable-based container-type detection
Automattic · Mar 25, 2021 · 4f91cc9 · 4f91cc9
2 parents 1fcc279 + f409613
commit 4f91cc9
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/000-vip-init.php b/000-vip-init.php
@@ -56,6 +56,8 @@
 	require __DIR__ . '/.secrets/vip-secrets.php';
 }
 
+require_once __DIR__ . '/lib/environment/class-environment.php';
+
 if ( ! defined( 'A8C_PROXIED_REQUEST' ) ) {
 	/**
 	 * @var constant A8C_PROXIED_REQUEST Set to true if the current request is made via the Automattic proxy, which is only available to Automatticians.
@@ -76,8 +78,8 @@
 	define( 'WPCOM_IS_VIP_ENV', false );
 }
 
-define( 'WPCOM_SANDBOXED', false !== strpos( gethostname(), '_web_dev_' ) );
-define( 'VIP_GO_IS_CLI_CONTAINER', false !== strpos( gethostname(), '_wpcli_' ) || false !== strpos( gethostname(), '_wp_cli_' ) );
+define( 'WPCOM_SANDBOXED', \Automattic\VIP\Environment::is_sandbox_container( gethostname(), $_ENV ) );
+define( 'VIP_GO_IS_CLI_CONTAINER', \Automattic\VIP\Environment::is_batch_container( gethostname(), $_ENV ) );
 
 // Used to verify emails sent via our SMTP servers
 if ( ! defined( 'WPCOM_VIP_MAIL_TRACKING_KEY' ) ) {