diff --git a/package.json b/app/package.json similarity index 100% rename from package.json rename to app/package.json diff --git a/server.js b/app/server.js similarity index 84% rename from server.js rename to app/server.js index 56141f01350f28d0a352a33ed14471adffeab4c3..5d0787fd158cfb60d2287661853e9a2db3f50186 100644 --- a/server.js +++ b/app/server.js @@ -2,11 +2,11 @@ const express = require('express'); const multer = require('multer'); const app = express(); const port = 3000; -app.use('/static', express.static('uploads')); +app.use('/static', express.static('upload')); const storage = multer.diskStorage({ destination: function (req, file, cb) { - cb(null, 'uploads/') // Make sure this folder exists + cb(null, 'upload/') // Make sure this folder exists }, filename: function (req, file, cb) { cb(null, file.fieldname + '-' + Date.now()) diff --git a/docker-compose.yml b/docker-compose.yml index 67befac2c18713d8e8c6e1d8dbe5b19f5702a763..15a755264200951347208b723a35c92a961d7dbd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,13 +3,12 @@ version: "3" services: front: build: - context: "docker/" - volumes: - - ${PWD}:/app + context: "docker/" environment: ENV: volumes: - - ./upload:/upload + - ./app:/app + - ./app/upload:/app/upload httpd: hostname: expose-scene-uploads @@ -19,5 +18,5 @@ services: - CORS_ALLOWED_HOSTS - WEBPACK_MODE=production volumes: - - ./upload:/srv + - ./app/upload:/srv - ./Caddyfile:/etc/caddy/Caddyfile diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 4f5feaa5d43f6f7dcfbe0b9e69670ec5b78046c4..ea22458cd46b708846165e2fcdc426f6d504d457 100755 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -1,7 +1,6 @@ #!/bin/bash npm install -./cli post_install if [ "$ENV" == "prod" ]; then cmd="npm start"