Merge branch 'develop' into feat/CORL-2787-quick-site-search-rebased

.dockerignore

@@ -1,30 +1,51 @@
 # tests are not run in the docker container.
 __tests__
+**/__tests__
+**/coverage
 coverage
 
 # we won't use the .git folder in production.
 .git
+.github
 
 # don't include the dependancies
 node_modules
+**/node_modules
 
 # don't include any logs
 npm-debug.log*
+**/npm-debug.log*
 
 # don't include any yarn files
 yarn-error.log
 yarn.lock
 
 # don't include any OS/editor files
 .env
+**/.env
 .idea/
 .vs
+.vscode
+
 .docz
+**/.docz
+
 *.swp
+**/*.swp
+
 *.DS_STORE
+*.DS_Store
+**/*.DS_STORE
+**/*.DS_Store
 
 # don't include any generated files
 dist
+**/dist
+
 *.css.d.ts
+**/*.css.d.ts
+
 __generated__
-docs/.next
+**/__generated__
+
+**/.next

Dockerfile

@@ -62,11 +62,14 @@ RUN cd server && \
   npm prune --production && \
   cd ..
 
+# Set working directory within server folder
+WORKDIR /usr/src/app/server
+
 # Setup the environment
 ENV NODE_ENV production
 ENV PORT 5000
 EXPOSE 5000
 
 # Run the node process directly instead of using `npm run start`:
 # SEE: https://github.com/nodejs/docker-node/blob/a2eb9f80b0fd224503ee2678867096c9e19a51c2/docs/BestPractices.md#cmd
-CMD ["node", "server/dist/index.js"]
+CMD ["node", "dist/index.js"]