moved js code into 'src' directory

Bechtel-Innovation-Design-Center · Nov 30, 2021 · 5d6089b · 5d6089b
1 parent f5e309d
commit 5d6089b
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 8 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,21 +2,23 @@ version: "3.8"
 services:
   auth_server:
     build:
-      context: .
+      context: ./src
+      dockerfile: Dockerfile
     env_file: ./.env
     volumes: 
-      - .:/ffs/
+      - ./src:/ffs/
       - /ffs/node_modules
     ports:
       - "3000:3000"
     command: "node server.js"
 
   task_runner_1:
     build:
-      context: .
+      context: ./src
+      dockerfile: Dockerfile
     env_file: ./.env
     volumes: 
-      - .:/ffs/
+      - ./src:/ffs/
       - /ffs/node_modules
     network_mode: host
     command: "node taskRunner.js lathe"
diff --git a/Dockerfile → src/Dockerfile b/Dockerfile → src/Dockerfile
@@ -1,5 +1,5 @@
 FROM node:16
 WORKDIR /ffs/
-COPY package.json .
+COPY package.json ./
 RUN npm install
-COPY . .
+COPY . ./
diff --git a/config.js → src/config.js b/config.js → src/config.js
@@ -2,7 +2,10 @@
  * Configures constants used in the other parts of this app
  */
 
-require('dotenv').config();
+const dotenv = require('dotenv');
+
+dotenv.config({path: '../.env'});
+
 const ForgeAuthClient = require('forge-apis').AuthClientThreeLegged;
 
 const scopes = ['bucket:create', 'bucket:read', 'data:read', 'data:create', 'data:write'];

diff --git a/downloader.js → src/downloader.js b/downloader.js → src/downloader.js
diff --git a/package-lock.json → src/package-lock.json b/package-lock.json → src/package-lock.json
diff --git a/package.json → src/package.json b/package.json → src/package.json
diff --git a/server.js → src/server.js b/server.js → src/server.js
@@ -112,7 +112,7 @@ const createServer = () => {
  * Used internally to refresh tokens automatically
  */
 const refresh = () => {
-  config.authClient.refreshToken(credentials, scopes)
+  config.authClient.refreshToken(credentials, config.scopes)
     .then(creds => {
       credentials = creds;
       console.log(

diff --git a/taskRunner.js → src/taskRunner.js b/taskRunner.js → src/taskRunner.js
diff --git a/watcher.js → src/watcher.js b/watcher.js → src/watcher.js