From ac6c7581f88734e7ccf8db603e62e88b93770aa8 Mon Sep 17 00:00:00 2001 From: Barry Low Date: Fri, 5 Oct 2018 12:49:11 -0700 Subject: [PATCH] update deployment --- api/.gitignore | 1 + api/docker-compose.api.yml | 4 ++-- api/src/index.js | 20 ++++++++------------ client/.gitignore | 1 + client/tools/webpack/webpack.prod.config.js | 1 + 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/api/.gitignore b/api/.gitignore index 131de51f8..d5985783d 100644 --- a/api/.gitignore +++ b/api/.gitignore @@ -1,4 +1,5 @@ /.env +/.env.prod /database/.env /database/docker-compose.prisma.prod.yml /docker-compose.prisma.prod.yml diff --git a/api/docker-compose.api.yml b/api/docker-compose.api.yml index 6282e3a87..54ec81af4 100644 --- a/api/docker-compose.api.yml +++ b/api/docker-compose.api.yml @@ -1,8 +1,8 @@ version: '3' services: api: - image: advancedalgosteamsmodule/teammodule-api:v1 - env_file: ./.env + image: advancedalgosteamsmodule/teammodule-api:v2 + env_file: ./.env.prod container_name: aateamapi tty: true stdin_open: true diff --git a/api/src/index.js b/api/src/index.js index e6fc19e54..7c81ae29e 100644 --- a/api/src/index.js +++ b/api/src/index.js @@ -187,19 +187,15 @@ let whitelist = [ 'http://localhost:3002', 'http://localhost:4000', 'http://localhost:4002', - 'http://localhost:1337' + 'http://localhost:1337', + 'https://teams.advancedalgos.net', + 'https://users.advancedalgos.net', + 'https://users-api.advancedalgos.net', + 'https://keyvault.advancedalgos.net', + 'https://keyvault-api.advancedalgos.net', + 'https://aawebdevelop.azurewebsites.net', + 'https://develop.advancedalgos.net' ] -if(process.env.NODE_ENV === 'production'){ - whitelist = [ - 'https://teams.advancedalgos.net', - 'https://users.advancedalgos.net', - 'https://users-api.advancedalgos.net', - 'https://keyvault.advancedalgos.net', - 'https://keyvault-api.advancedalgos.net', - 'http://localhost:1337' - ] -} - const corsOptionsDelegate = (req, callback) => { var corsOptions diff --git a/client/.gitignore b/client/.gitignore index 64458ae7a..7c1f225e5 100644 --- a/client/.gitignore +++ b/client/.gitignore @@ -56,6 +56,7 @@ typings/ # dotenv environment variables file .env +.env.prod # Build folder js files build/ diff --git a/client/tools/webpack/webpack.prod.config.js b/client/tools/webpack/webpack.prod.config.js index 14724d7ad..b5810a748 100644 --- a/client/tools/webpack/webpack.prod.config.js +++ b/client/tools/webpack/webpack.prod.config.js @@ -12,6 +12,7 @@ const Dotenv = require('dotenv-webpack') module.exports = merge(commonConfig, { mode: 'production', + devtool: 'inline-sourcemap', output: { path: path.resolve(__dirname, '../../build'), filename: 'script.js'