Merge pull request #198 from nhsuk/feature/tweaks

Updates and stuff

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:10.16.0-alpine
+FROM node:10.16.3-alpine
 
 RUN apk add --no-cache python git-perl bash make gcc g++
 RUN rm /bin/sh && ln -s /bin/bash /bin/sh

package.json

@@ -80,8 +80,8 @@
     "coveralls": "^3.0.0",
     "destroy": "^1.0.4",
     "eslint": "^6.0.1",
-    "eslint-config-airbnb": "^17.0.0",
-    "eslint-config-airbnb-base": "^13.0.0",
+    "eslint-config-airbnb": "^18.0.0",
+    "eslint-config-airbnb-base": "^14.0.0",
     "eslint-config-nhsuk": "^0.19.0",
     "eslint-plugin-import": "^2.17.2",
     "eslint-plugin-json": "^1.3.2",

scripts/devops/check-performance-test-results

@@ -1,7 +1,6 @@
 #!/bin/bash
-: "${PERF_TEST_AVG_RESPONSE_THRESHOLD:=600}"
-: "${PERF_TEST_PCT_CHECK:=90}"
-: "${PERF_TEST_PCT_THRESHOLD:=1000}"
-export PERF_TEST_PCT_CHECK PERF_TEST_AVG_RESPONSE_THRESHOLD PERF_TEST_PCT_THRESHOLD
+export PERF_TEST_AVG_RESPONSE_THRESHOLD="${PERF_TEST_AVG_RESPONSE_THRESHOLD:=600}"
+export PERF_TEST_PCT_CHECK="${PERF_TEST_PCT_CHECK:=90}"
+export PERF_TEST_PCT_THRESHOLD="${PERF_TEST_PCT_THRESHOLD:=1000}"
 
 node ./scripts/devops/check-performance-test-results.js

scripts/devops/get-vault-variables

@@ -1,15 +1,5 @@
 #!/bin/bash
 
-RANCHER_STACK_NAME=$PROJECT_NAME
-if [ -n "$PRID" ]; then
-  RANCHER_STACK_NAME="$RANCHER_STACK_NAME-pr-$PRID"
-fi
-# Set some defaults
-{
-  echo "RANCHER_STACK_NAME=$RANCHER_STACK_NAME"
-  echo "TRAEFIK_DOMAIN=nhswebsite-integration.nhs.uk"
-} >> answers.txt
-
 get_vault_data() {
   VAULT_PATH="$1"
 

scripts/devops/set-branch-variables

@@ -15,7 +15,15 @@ TAG=$(echo "$CLEANED_SOURCEBRANCH" | sed -E -n -e's:^refs-tags-(.+)$:\1:p')
 echo "TAG: $TAG"
 echo "##vso[task.setvariable variable=TAG]$TAG"
 
+RANCHER_STACK_NAME=$PROJECT_NAME
+if [ -n "$PRID" ]; then
+  RANCHER_STACK_NAME="$RANCHER_STACK_NAME-pr-$PRID"
+fi
+
+# Set some defaults
 {
+  echo "RANCHER_STACK_NAME=$RANCHER_STACK_NAME"
+  echo "TRAEFIK_DOMAIN=nhswebsite-integration.nhs.uk"
   echo "BRANCH=$BRANCH"
   echo "PRID=$PRID"
   echo "TAG=$TAG"