attempting progress

client/.dockerignore

@@ -1,2 +1,24 @@
-node_modules
-npm-debug.log
+**/.classpath
+**/.dockerignore
+**/.env
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/azds.yaml
+**/charts
+**/docker-compose*
+**/compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+README.md

client/.vscode/launch.json

@@ -14,9 +14,13 @@
       "request": "launch",
       "protocol": "inspector",
       "program": "${workspaceRoot}/node_modules/gatsby/dist/bin/gatsby",
-      "args": ["develop"],
+      "args": [
+        "develop"
+      ],
       "stopOnEntry": false,
-      "runtimeArgs": ["--nolazy"],
+      "runtimeArgs": [
+        "--nolazy"
+      ],
       "sourceMaps": false
     },
     {
@@ -25,9 +29,13 @@
       "request": "launch",
       "protocol": "inspector",
       "program": "${workspaceRoot}/node_modules/gatsby/dist/bin/gatsby",
-      "args": ["build"],
+      "args": [
+        "build"
+      ],
       "stopOnEntry": false,
-      "runtimeArgs": ["--nolazy"],
+      "runtimeArgs": [
+        "--nolazy"
+      ],
       "sourceMaps": false
     },
     {
@@ -42,6 +50,13 @@
       "console": "integratedTerminal",
       "internalConsoleOptions": "neverOpen",
       "port": 9229
+    },
+    {
+      "name": "Docker Node.js Launch",
+      "type": "docker",
+      "request": "launch",
+      "preLaunchTask": "docker-run: debug",
+      "platform": "node"
     }
   ]
 }

client/.vscode/tasks.json

@@ -0,0 +1,40 @@
+{
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"type": "docker-build",
+			"label": "docker-build",
+			"platform": "node",
+			"dockerBuild": {
+				"dockerfile": "${workspaceFolder}/Dockerfile",
+				"context": "${workspaceFolder}",
+				"pull": true
+			}
+		},
+		{
+			"type": "docker-run",
+			"label": "docker-run: release",
+			"dependsOn": [
+				"docker-build"
+			],
+			"platform": "node"
+		},
+		{
+			"type": "docker-run",
+			"label": "docker-run: debug",
+			"dependsOn": [
+				"docker-build"
+			],
+			"dockerRun": {
+				"env": {
+					"DEBUG": "*",
+					"NODE_ENV": "development"
+				},
+				"command": "yarn start --inspect=0.0.0.0:9229"
+			},
+			"node": {
+				"enableDebugging": true
+			}
+		}
+	]
+}

client/Dockerfile

@@ -1,20 +1,10 @@
-FROM node:14 AS build
-
-# This will henceforth be our app directory
+FROM node:14-alpine
+ENV NODE_ENV=production
 WORKDIR /usr/src/app
-
-# Copy both package.json and package-lock.json
-COPY package*.json ./
-
-# Install dependencies
-RUN npm install
-
-# Copy App source
-COPY . . 
-
+RUN apk --no-cache add git
+COPY ["package.json", "package-lock.json*", "npm-shrinkwrap.json*", "./"]
+RUN npm install && mv node_modules ../
+RUN npm install --global gatsby-cli
+COPY . .
 EXPOSE 8000
-CMD [ "npm", "start" ]
-
-# RUN npm build
-# FROM scratch AS bin
-# COPY --from=build ./public /
+CMD ["npm", "start"]

client/docker-compose.debug.yml

@@ -0,0 +1,14 @@
+version: '3.4'
+
+services:
+  justice40tool:
+    image: justice40tool
+    build:
+      context: .
+      dockerfile: ./Dockerfile
+    environment:
+      NODE_ENV: development
+    ports:
+      - 8000:8000
+      - 9229:9229
+    command: ["npm", "start", "--inspect=0.0.0.0:9229"]

client/docker-compose.yml

@@ -0,0 +1,12 @@
+version: '3.4'
+
+services:
+  justice40tool:
+    image: justice40tool
+    build:
+      context: .
+      dockerfile: ./Dockerfile
+    environment:
+      NODE_ENV: production
+    ports:
+      - 8000:8000

client/gatsby-config.js

@@ -34,10 +34,10 @@ module.exports = {
           patterns: [
             // The pattern "**/*.{js,jsx,ts,tsx}" is
             // not used because we will rely on `eslint --fix`
-            '**/*.{css,scss,less}',
-            '**/*.{json,json5}',
+            // '**/*.{css,scss,less}',
+            // '**/*.{json,json5}',
             '**/*.{graphql}',
-            '**/*.{md,mdx}',
+            // '**/*.{md,mdx}',
             '**/*.{html}',
             '**/*.{yaml,yml}',
           ],

client/package.json

@@ -60,6 +60,7 @@
     "jest": "^27.0.1",
     "license-checker": "^25.0.1",
     "prettier": "^2.3.0",
+    "prop-types": "^15.7.2",
     "react-test-renderer": "^17.0.2",
     "sass": "^1.33.0",
     "sass-loader": "^11.1.1",
@@ -67,7 +68,7 @@
     "ts-jest": "^27.0.0"
   },
   "dependencies": {
-    "@trussworks/react-uswds": "github:nathillardusds/react-uswds#nathillardusds/ssr",
+    "@trussworks/react-uswds": "nathillardusds/react-uswds#nathillardusds/ssr",
     "query-string": "^7.0.0",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",

docker-compose.yml

@@ -0,0 +1,16 @@
+version: "3"
+services:
+  client:
+    build:
+      context: ./client
+      dockerfile: Dockerfile
+    ports:
+      - "8000:8000"
+      - "9929:9929"
+      - "9230:9230"
+    # volumes:
+    #   - /client/node_modules
+    #   - ./client:/app
+    environment:
+      - NODE_ENV=development
+      - GATSBY_WEBPACK_PUBLICPATH=/