Add Sentry 8 and Docker / Docker Compose supports

.dockerignore

@@ -1,7 +1,6 @@
 node_modules/
 dist/
 build/
-.env
 .env.example
 .travis.yml
 .docker-compose.yml

README.md

@@ -38,19 +38,28 @@ Launches Jest test runner.<br>
 Launches TestCafe test runner and performs browser tests on headless chrome.<br>
 
 ### `npm run browserTestCLI`
-Launches the application using `node dist` command and then launches TestCafe test runner in headless mode. Mainly used by Travis CI.
+Launches the application using `node dist` command and then launches TestCafe test runner in headless mode. Mainly used in GitHub Actions.
 
 ## How to use
 For development: 
 - Make sure npm packages are installed by running `npm install --legacy-peer-deps`in project root.
 - Make sure you have environment variables set. `.env.example` should have all required values so you can copy it to `.env`.
 - Then you can start development server using `npm run dev`. Which watches files and updates on code changes.
+- Open the application by loading `localhost:2048` in the browser
 
 To run in production mode:
 - Make sure npm packages are installed by running `npm install --legacy-peer-deps`in project root.
 - Make sure you have environment variables set. `.env.example` should have all required values so you can copy it to `.env`.
 - Build files by running `npm run build`
-- Then you can just run the app with `npm start`
+- Then you can run the app with `npm start`
+- Open the application by loading `localhost:2048` in the browser
+
+To run with docker compose:
+- Install Docker if not installed, check that port `2048` is free, not occupied by running server.
+- Make sure you have environment variables set. `.env.example` should have all required values so you can copy it to `.env`.
+- Run `docker compose up`
+- Open the application by loading `localhost:2048` in the browser
+
 
 ## Environment variables
 This is a documentation (some day hopefully exhaustive) of environment variables and how to use them.

docker-compose.yml

@@ -1,6 +1,5 @@
-version: "3.8"
 services:
-  web:
+  app:
     build: .
     ports:
       - "2048:2048"

server/server.js

@@ -52,7 +52,7 @@ const setupTests = () => {
 setupTests();
 
 // Handle sitemap creation
-  if (sitemapActive()) {
+if (sitemapActive()) {
   // Generate sitemap on start
   generateSitemap();
   // Update sitemap every monday
@@ -70,10 +70,6 @@ const supportedLanguages = config.supportedLanguages;
 // This is required for proxy setups to work in production
 app.set('trust proxy', true);
 
-// The request handler must be the first middleware on the app
-if (Sentry) {
-  app.use(Sentry.Handlers.requestHandler());
-}
 // Add static folder
 app.use(express.static(path.resolve(__dirname, 'src')));
 
@@ -151,9 +147,9 @@ app.get('/*', (req, res, next) => {
   res.end(htmlTemplate(req, reactDom, preloadedState, css, cssString, emotionCss, locale, helmet, customValues));
 });
 
-// The error handler must be before any other error middleware
+// Setup Sentry error handler
 if (Sentry) {
-  app.use(Sentry.Handlers.errorHandler());
+  Sentry.setupExpressErrorHandler(app);
 }
 console.log('Application version tag:', GIT_TAG, 'commit:', GIT_COMMIT);
 console.log(`Starting server on port ${process.env.PORT || 2048}`);