Skip to content

#11 downloader #14

Merged
merged 13 commits into from
Dec 11, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,13 @@
"extends": [
"standard"
],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaVersion": 13
"ecmaVersion": 12
},
"plugins": [
"@typescript-eslint"
],
"rules": {
"semi": [2, "always"]
}
}
}
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@
node_modules

credentials.json
download_tests
download_tests
build
FileShare
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM node:16
WORKDIR /ffs/
COPY package.json .
COPY package.json ./
RUN npm install
COPY . .
COPY /src/build ./
50 changes: 45 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,62 @@
version: "3.8"

services:
auth_server:
build:
context: .
dockerfile: Dockerfile
env_file: ./.env
volumes:
- .:/ffs/
- ./src/build:/ffs/
- /ffs/node_modules
ports:
- "3000:3000"
- ${PORT}:${PORT}
command: "node server.js"

task_runner_1:
task_runner_gantry:
build:
context: .
dockerfile: Dockerfile
env_file: ./.env
volumes:
- ./src/build:/ffs/
- /ffs/node_modules
- ${LOCAL_DIR_GANTRY}:/ffs/FileShare/Gantry
network_mode: host
command: "node taskRunner.js gantry"

task_runner_lathe:
build:
context: .
dockerfile: Dockerfile
env_file: ./.env
volumes:
- ./src/build:/ffs/
- /ffs/node_modules
- ${LOCAL_DIR_LATHE}:/ffs/FileShare/Lathe
network_mode: host
command: "node taskRunner.js lathe"

task_runner_mill:
build:
context: .
dockerfile: Dockerfile
env_file: ./.env
volumes:
- ./src/build:/ffs/
- /ffs/node_modules
- ${LOCAL_DIR_MILL}:/ffs/FileShare/Mill
network_mode: host
command: "node taskRunner.js mill"

task_runner_waterjet:
build:
context: .
dockerfile: Dockerfile
env_file: ./.env
volumes:
- .:/ffs/
- ./src/build:/ffs/
- /ffs/node_modules
- ${LOCAL_DIR_WATERJET}:/ffs/FileShare/Waterjet
network_mode: host
command: "node taskRunner.js lathe"
command: "node taskRunner.js waterjet"
14 changes: 14 additions & 0 deletions environment.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
declare global {
namespace NodeJS {
interface ProcessEnv {
FORGE_CLIENT_ID: string;
FORGE_CLIENT_SECRET: string;
FORGE_CALLBACK_URL: string;
PORT: string;
}
}
}

// If this file has no import/export statements (i.e. is a script)
// convert it into a module by adding an empty export statement.
export {}
Loading