diff --git a/config/production.json b/config/production.json index fc7ab53..4bf24d1 100644 --- a/config/production.json +++ b/config/production.json @@ -2,6 +2,6 @@ "port": 3000, "database": ".db", "rcFile": "./.codexdocsrc", - "uploads": "public/uploads", + "uploads": "/uploads", "secret": "iamasecretstring" } diff --git a/docker-compose.yml b/docker-compose.yml index f07d2a5..56ffa6a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,6 +9,6 @@ services: volumes: - ./.codexdocsrc:/usr/src/app/.codexdocsrc:ro - ./config/production.json:/usr/src/app/config/production.json:ro - - ./public/uploads:/usr/src/app/public/uploads + - ./public/uploads:/uploads - ./.db:/usr/src/app/.db - /usr/src/app/node_modules diff --git a/src/backend/app.ts b/src/backend/app.ts index 57836d0..5f6f49b 100644 --- a/src/backend/app.ts +++ b/src/backend/app.ts @@ -5,11 +5,12 @@ import morgan from 'morgan'; import rcParser from './utils/rcparser'; import routes from './routes'; import HttpException from './exceptions/httpException'; +import config from 'config'; const app = express(); -const config = rcParser.getConfiguration(); +const localConfig = rcParser.getConfiguration(); -app.locals.config = config; +app.locals.config = localConfig; // view engine setup app.set('views', path.join(__dirname, './', 'views')); app.set('view engine', 'twig'); @@ -20,6 +21,7 @@ app.use(express.json()); app.use(express.urlencoded({ extended: true })); app.use(cookieParser()); app.use(express.static(path.join(__dirname, '../../public'))); +app.use('/uploads', express.static(config.get('uploads'))); app.use('/', routes);