From 4097b56aac6075b4c0053805da676368a82dcd73 Mon Sep 17 00:00:00 2001
From: Elian Loraux <elian.loraux@tetras-libre.fr>
Date: Fri, 2 Feb 2024 16:26:59 +0100
Subject: [PATCH] divers
---
package.json => app/package.json | 0
server.js => app/server.js | 4 ++--
docker-compose.yml | 9 ++++-----
docker/entrypoint.sh | 1 -
4 files changed, 6 insertions(+), 8 deletions(-)
rename package.json => app/package.json (100%)
rename server.js => app/server.js (84%)
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 56141f0..5d0787f 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 67befac..15a7552 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 4f5feaa..ea22458 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"
--
GitLab