feat(docker): Prep master for docker deploys

This commit is contained in:
Bouncey
2019-02-04 11:42:31 +00:00
committed by mrugesh mohapatra
parent 9e4583b1f3
commit d79f9f4899
19 changed files with 841 additions and 652 deletions

View File

@ -10,7 +10,7 @@ import debug from 'debug';
import accepts from 'accepts';
import dedent from 'dedent';
import { homeLocation } from '../../../config/env.json';
import { homeLocation } from '../../../config/env';
import { ifNoUserSend } from '../utils/middleware';
import { dasherize } from '../utils';
@ -321,7 +321,7 @@ export default async function bootChallenge(app, done) {
) {
req.flash(
'danger',
"You haven't supplied the necessary URLs for us to inspect your work."
'You haven\'t supplied the necessary URLs for us to inspect your work.'
);
return res.sendStatus(403);
}

View File

@ -1,6 +1,6 @@
import accepts from 'accepts';
import { homeLocation } from '../../../config/env.json';
import { homeLocation } from '../../../config/env';
export default function fourOhFour(app) {
app.all('*', function(req, res) {

View File

@ -6,7 +6,7 @@ import url from 'url';
import jwt from 'jsonwebtoken';
import dedent from 'dedent';
import { homeLocation } from '../../config/env.json';
import { homeLocation } from '../../config/env';
import { jwtSecret } from '../../config/secrets';
import passportProviders from './passport-providers';
import { createCookieConfig } from './utils/cookieConfig';

View File

@ -1,5 +1,5 @@
import { auth0 } from '../../config/secrets';
import { homeLocation } from '../../config/env.json';
import { homeLocation } from '../../config/env';
const { clientID, clientSecret, domain } = auth0;

View File

@ -1,5 +1,5 @@
// this ensures node understands the future
require('babel-register');
require('@babel/register');
const _ = require('lodash');
const createDebugger = require('debug');

View File

@ -2,7 +2,7 @@ import dedent from 'dedent';
import { validationResult } from 'express-validator/check';
import { createValidatorErrorFormatter } from './create-handled-error.js';
import { homeLocation } from '../../../config/env.json';
import { homeLocation } from '../../../config/env';
export function ifNoUserRedirectTo(url, message, type = 'errors') {
return function(req, res, next) {