Merge pull request #130 from ministryofjustice/build-patch-staging-me…

…rge-dev-test Build patch staging merge dev test
ministryofjustice · Nov 15, 2023 · 850f6d7 · 850f6d7
2 parents 1c1c30c + 679b4e1
commit 850f6d7
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 30 deletions.
diff --git a/composer.json b/composer.json
@@ -46,10 +46,7 @@
         "ministryofjustice/justicejobs": "dev-main",
         "ministryofjustice/ppo": "dev-main",
         "ministryofjustice/hale-components": "dev-main",
-        "ministryofjustice/hale-dash": "dev-main",
-        "ministryofjustice/ppo": "dev-main",
         "ministryofjustice/sifocc": "dev-main",
-        "ministryofjustice/hale-components": "dev-main",
         "wpackagist-plugin/advanced-custom-fields-table-field":"1.3.20",
         "wpackagist-plugin/advanced-responsive-video-embedder": "*",
         "wpackagist-plugin/analytify-analytics-dashboard-widget":"*",
@@ -74,6 +71,7 @@
         "wpackagist-plugin/wp-analytify":"*",
         "wpackagist-plugin/wp-force-login": "*",
         "wpackagist-plugin/wps-hide-login": "*",
+        "wpackagist-plugin/wp-sentry-integration": "*",
         "ministryofjustice/wp-moj-components": "dev-hale-platform",
         "ministryofjustice/wp-user-roles": "*",
         "ministryofjustice/cookie-compliance-for-wordpress": "*",

diff --git a/opt/php/application.php b/opt/php/application.php
@@ -7,31 +7,31 @@
 /**
  * Initialise Sentry
  */
-$environment = '';
-
-switch ($envType) {
-    case 'prod':
-        $environment = 'Production';
-        break;
-    case 'staging':
-        $environment = 'Staging';
-        break;
-    case 'dev':
-        $environment = 'Development';
-        break;
-    case 'demo':
-        $environment = 'Demonstration';
-        break;
-}
-
-if (function_exists('sentry\init')) {
-    \Sentry\init([
-        'dsn' => "https://4d7a410074614517899f22cf025d2e74@o345774.ingest.sentry.io/4505040969400320",
-        'environment' => "$environment",
-    ]);
-
-    \Sentry\captureLastError();
-}
+// $environment = '';
+
+// switch ($envType) {
+//     case 'prod':
+//         $environment = 'Production';
+//         break;
+//     case 'staging':
+//         $environment = 'Staging';
+//         break;
+//     case 'dev':
+//         $environment = 'Development';
+//         break;
+//     case 'demo':
+//         $environment = 'Demonstration';
+//         break;
+// }
+
+// if (function_exists('sentry\init')) {
+//     \Sentry\init([
+//         'dsn' => "https://4d7a410074614517899f22cf025d2e74@o345774.ingest.sentry.io/4505040969400320",
+//         'environment' => "$environment",
+//     ]);
+
+//     \Sentry\captureLastError();
+// }
 
 /**
  * Handle errors in different environments

diff --git a/opt/scripts/config.sh b/opt/scripts/config.sh
@@ -17,7 +17,8 @@ wp config set FORCE_SSL_ADMIN true --raw
 wp config set S3_UPLOADS_BUCKET "\$_SERVER['S3_UPLOADS_BUCKET']" --raw
 wp config set S3_UPLOADS_REGION "\$_SERVER['S3_UPLOADS_REGION']" --raw
 wp config set S3_UPLOADS_USE_INSTANCE_PROFILE "\$_SERVER['S3_UPLOADS_USE_INSTANCE_PROFILE']" --raw
-wp config set  QM_ENABLE_CAPS_PANEL true --raw
+wp config set QM_ENABLE_CAPS_PANEL true --raw
+wp config set WP_CACHE true --raw
 
 #WP core install
 wp core multisite-install --title="Hale Multisite Platform" \

diff --git a/wordpress.dockerfile b/wordpress.dockerfile
@@ -5,7 +5,7 @@
 # ##################################################
 
 # Build multisite
-FROM --platform=linux/amd64 wordpress:6.4.0-php8.2-fpm-alpine
+FROM --platform=linux/amd64 wordpress:6.4.1-php8.2-fpm-alpine
 
 # Install additional Alpine packages
 RUN apk update && \