diff --git a/.gitignore b/.gitignore index 5111ece..cbff4b0 100755 --- a/.gitignore +++ b/.gitignore @@ -17,4 +17,5 @@ package-lock.json ._* .DS_Store dist/ -rds-combined-ca-bundle.pem \ No newline at end of file +rds-combined-ca-bundle.pem +docker-variables.env diff --git a/Dockerfile b/Dockerfile index 2d256df..ef06fc6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node +FROM node:13 WORKDIR /usr/app diff --git a/backend/key/getWebUIKey.ts b/backend/key/getWebUIKey.ts index 096b516..42c1791 100644 --- a/backend/key/getWebUIKey.ts +++ b/backend/key/getWebUIKey.ts @@ -36,15 +36,14 @@ const getWebUIKey = () => { }) const port = process.env.HTTP_PORT || process.env.PORT || "3000"; - const url = "localhost"; + const url = process.env.DOCKER ? undefined : "localhost"; const server = http.createServer(app) as any; server.listen(port, url, () => { - const fullURL = `http://localhost:${port!}`; - - console.log("\nPlease Navigate To", fullURL, "To Enter Encryption Password\n") + console.log(`\nPlease navigate to http://localhost:${port} to enter encryption key\n`) + }); }) diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..e57c087 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,24 @@ +version: '3' + +services: + app: + container_name: mydrive-node + restart: always + build: . + ports: + - '3000:3000' + - '8080:8080' + env_file: + - docker-variables.env + links: + - mongo + mongo: + container_name: mongo + image: mongo + ports: + - '27017:27017' + volumes: + - 'mongodb_data_volume:/data/db' +volumes: + mongodb_data_volume: + external: true \ No newline at end of file diff --git a/src/actions/auth.js b/src/actions/auth.js index fdbd909..0a719cf 100755 --- a/src/actions/auth.js +++ b/src/actions/auth.js @@ -43,7 +43,6 @@ export const startCreateAccount = (email, password) => { return (dispatch) => { - const dt = {email, password}; axios.post(currentURL+"/user-service/create", dt).then((response) => { diff --git a/webpack.config.js b/webpack.config.js index 66d7061..1ed98b9 100755 --- a/webpack.config.js +++ b/webpack.config.js @@ -14,6 +14,7 @@ const path = require("path"); module.exports = (env) => { + //console.log("env docker", process.env.DOCKER); if (env === "test") { @@ -29,6 +30,7 @@ module.exports = (env) => { console.log("Loading production env variables") require("dotenv").config({path: ".env.production"}); + require("dotenv").config({path: "docker-variables.env"}); } console.log("env", env);