build: Release 4.36.0

.template-env

@@ -30,7 +30,7 @@ FORMSG_SDK_MODE=
 ## App Config
 # APP_NAME=FormSG
 # OTP_LIFE_SPAN=900000
-# BOUNCE_LIFE_SPAN=1800000
+# BOUNCE_LIFE_SPAN=86400000
 # AGGREGATE_COLLECTION=
 
 # If provided, a banner with the provided message will show up in every form.

.travis.yml

@@ -11,10 +11,8 @@ cache:
   - npm
   - pip
 
-# Setup browsers needed for end-to-end tests
-before_install:
-  - sudo apt-get clean && sudo apt-get update
-  - sudo apt-get install -y dpkg google-chrome-stable fluxbox chromium-browser
+addons:
+  chrome: stable
 
 notifications:
   email:
@@ -25,17 +23,12 @@ notifications:
     on_success: always
     on_failure: always
 
-before_script:
-  - fluxbox >/dev/null 2>&1 &
-  - pyenv global 3.7.1
-  - pip3 install --user localstack[full]
-
 script:
   - set -e
   - npm run lint-ci
   - npm run build
   - npm run test-ci
-  # - npm run test-e2e-ci
+  - npm run test-e2e-ci
 
 before_deploy:
   # Workaround to run before_deploy only once

Dockerfile.development

@@ -38,4 +38,4 @@ EXPOSE 5000
 # e.g. chromium when launched to create a new PDF
 ENTRYPOINT [ "tini", "--" ]
 # Create local S3 buckets before building the app
-CMD sh init-localstack.sh && npm run docker-dev
+CMD npm run docker-dev

docker-compose.yml

@@ -12,7 +12,7 @@ services:
       - /opt/formsg/node_modules
     ports:
       - '5000:5000'
-      - '4572:4572' # localstack ports
+      - '4566:4566' # localstack ports
       - '5156:5156' # mockpass ports
       - '9229:9229' # Node debugger port
     environment:
@@ -25,10 +25,11 @@ services:
       - IMAGE_S3_BUCKET=local-image-bucket
       - LOGO_S3_BUCKET=local-logo-bucket
       - FORMSG_SDK_MODE=development
-      - BOUNCE_LIFE_SPAN=1800000
+      - BOUNCE_LIFE_SPAN=86400000
       - AWS_ACCESS_KEY_ID=fakeKey
       - AWS_SECRET_ACCESS_KEY=fakeSecret
       - SESSION_SECRET=thisisasecret
+      - AWS_ENDPOINT=http://localhost:4566
       - GA_TRACKING_ID
       - SENTRY_CONFIG_URL
       - TWILIO_ACCOUNT_SID
@@ -64,7 +65,6 @@ services:
       - IS_SP_MAINTENANCE
       - IS_CP_MAINTENANCE
       - AGGREGATE_COLLECTION
-      - AWS_ENDPOINT=http://localhost:4572
 
   mockpass:
     build: https://github.com/opengovsg/mockpass.git
@@ -92,17 +92,23 @@ services:
       - '27017:27017'
 
   localstack:
-    image: localstack/localstack:latest
+    image: localstack/localstack:0.11.5
     container_name: formsg-localstack
     depends_on:
       - formsg
     environment:
       - SERVICES=s3
       - DATA_DIR=/tmp/localstack/data
+      - ATTACHMENT_S3_BUCKET=local-attachment-bucket
+      - IMAGE_S3_BUCKET=local-image-bucket
+      - LOGO_S3_BUCKET=local-logo-bucket
     volumes:
       - './.localstack:/tmp/localstack'
       - '/var/run/docker.sock:/var/run/docker.sock'
-    network_mode: 'service:formsg' # reuse formsg service's network stack so that it can resolve localhost:4572 to localstack:4572
+      # This is where we add scripts to initialise AWS resources.
+      # Docs: https://github.com/localstack/localstack#initializing-a-fresh-instance
+      - './docker-entrypoint-initaws.d:/docker-entrypoint-initaws.d'
+    network_mode: 'service:formsg' # reuse formsg service's network stack so that it can resolve localhost:4566 to localstack:4566
 
 volumes:
   mongodata:

docker-entrypoint-initaws.d/init-localstack.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+set -x
+awslocal s3 mb s3://$IMAGE_S3_BUCKET
+awslocal s3 mb s3://$LOGO_S3_BUCKET
+awslocal s3 mb s3://$ATTACHMENT_S3_BUCKET
+set +x