Merge pull request #31 from testdrivenio/updates

Updates

Author: mjhea0

buildspec.yml

@@ -3,16 +3,15 @@ version: 0.2
 env:
   variables:
     AWS_REGION: "us-west-1"
-    REACT_APP_API_SERVICE_URL: "http://flask-react-alb-828458753.us-west-1.elb.amazonaws.com"
+    REACT_APP_API_SERVICE_URL: "http://flask-react-alb-1132421372.us-west-1.elb.amazonaws.com"
 
 phases:
-  install:
-    runtime-versions:
-      docker: 18
   pre_build:
     commands:
       - echo logging in to ecr...
-      - $(aws ecr get-login --no-include-email --region $AWS_REGION)
+      - >
+        aws ecr get-login-password --region $AWS_REGION \
+          | docker login --username AWS --password-stdin $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com
       - |
         if expr "$CODEBUILD_WEBHOOK_TRIGGER" == "branch/master" >/dev/null  && expr "$CODEBUILD_WEBHOOK_HEAD_REF" == "refs/heads/master" >/dev/null; then
           DOCKER_TAG=prod

services/client/.eslintrc.json

@@ -1,35 +1,34 @@
 {
-    "parser": "babel-eslint",
-    "parserOptions": {
-      "ecmaVersion": 2018,
-      "ecmaFeatures": {
-        "jsx": true
-      },
-      "sourceType": "module"
+  "parser": "babel-eslint",
+  "parserOptions": {
+    "ecmaVersion": 2018,
+    "ecmaFeatures": {
+      "jsx": true
     },
-    "settings": {
-      "react": {
-        "version": "16.0"
-      }
-    },
-    "plugins": [
-      "react"
-    ],
-
-    "extends": [
-      "standard-jsx"
-    ],
-    "rules": {
-      "react/jsx-no-bind": ["error", {
-        "allowArrowFunctions": true,
-        "allowBind": false,
-        "ignoreRefs": true
-      }],
-      "react/no-did-update-set-state": "error",
-      "react/no-unknown-property": "error",
-      "react/no-unused-prop-types": "error",
-      "react/react-in-jsx-scope": "error",
-      "jsx-quotes": "off",
-      "react/jsx-indent": "off"
+    "sourceType": "module"
+  },
+  "settings": {
+    "react": {
+      "version": "16.0"
     }
+  },
+  "plugins": [
+    "react"
+  ],
+  "extends": [
+    "standard-jsx"
+  ],
+  "rules": {
+    "react/jsx-no-bind": ["error", {
+      "allowArrowFunctions": true,
+      "allowBind": false,
+      "ignoreRefs": true
+    }],
+    "react/no-did-update-set-state": "error",
+    "react/no-unknown-property": "error",
+    "react/no-unused-prop-types": "error",
+    "react/react-in-jsx-scope": "error",
+    "jsx-quotes": "off",
+    "react/jsx-indent": "off"
   }
+}

services/client/Dockerfile

@@ -1,5 +1,5 @@
 # pull official base image
-FROM node:15.2.0-alpine
+FROM node:16-alpine
 
 # set working directory
 WORKDIR /usr/src/app
@@ -11,7 +11,7 @@ ENV PATH /usr/src/app/node_modules/.bin:$PATH
 COPY package.json .
 COPY package-lock.json .
 RUN npm ci
-RUN npm install [email protected].0 [email protected] [email protected] -g --silent
+RUN npm install [email protected].3 -g --silent
 
 # start app
 CMD ["npm", "start"]

services/client/Dockerfile.prod

@@ -3,7 +3,7 @@
 ###########
 
 # pull official base image
-FROM node:15.2.0-alpine as builder
+FROM node:16-alpine as builder
 
 # set working directory
 WORKDIR /usr/src/app
@@ -15,7 +15,7 @@ ENV PATH /usr/src/app/node_modules/.bin:$PATH
 COPY package.json .
 COPY package-lock.json .
 RUN npm ci
-RUN npm install [email protected].0 --silent
+RUN npm install [email protected].3 --silent
 
 
 # set environment variables
@@ -34,7 +34,7 @@ RUN npm run build
 #########
 
 # base image
-FROM nginx:1.19.4-alpine
+FROM nginx:stable-alpine
 
 # update nginx conf
 RUN rm -rf /etc/nginx/conf.d