diff --git a/Dockerfile.production b/Dockerfile similarity index 50% rename from Dockerfile.production rename to Dockerfile index 6451069..abe2d39 100644 --- a/Dockerfile.production +++ b/Dockerfile @@ -1,4 +1,7 @@ -FROM node:20 +FROM node:20-alpine + +RUN apk add --no-cache python3 make g++ ffmpeg \ + && ln -sf python3 /usr/bin/python WORKDIR /usr/app-production diff --git a/backend/server/server-start.ts b/backend/server/server-start.ts index 579f1ef..94b64e2 100644 --- a/backend/server/server-start.ts +++ b/backend/server/server-start.ts @@ -10,25 +10,24 @@ const serverStart = async () => { console.log("ENV", process.env.NODE_ENV); + const httpPort = process.env.HTTP_PORT || process.env.PORT || 3000; + const httpsPort = process.env.HTTPS_PORT || 8080 + if (process.env.NODE_ENV === "production" && process.env.SSL === "true") { - server.listen(process.env.HTTP_PORT, process.env.URL, () => { - console.log("Http Server Running On Port:", process.env.HTTP_PORT); + server.listen(httpPort, process.env.URL, () => { + console.log("Http Server Running On Port:", httpPort); }); - serverHttps.listen(process.env.HTTPS_PORT, function () { - console.log("Https Server Running On Port:", process.env.HTTPS_PORT); + serverHttps.listen(httpsPort, function () { + console.log("Https Server Running On Port:", httpsPort); }); } else if (process.env.NODE_ENV === "production") { - const port = process.env.HTTP_PORT || process.env.PORT; - - server.listen(port, process.env.URL, () => { - console.log("Http Server (No-SSL) Running On Port:", port); + server.listen(httpPort, process.env.URL, () => { + console.log("Http Server (No-SSL) Running On Port:", httpPort); }); } else { - const port = process.env.HTTP_PORT || process.env.PORT; - - server.listen(port, process.env.URL, () => { - console.log("\nDevelopment Backend Server Running On :", port); + server.listen(httpPort, process.env.URL, () => { + console.log("\nDevelopment Backend Server Running On :", httpPort); }); } }; diff --git a/backend/utils/getFSStoragePath.ts b/backend/utils/getFSStoragePath.ts index 296d8eb..cc98539 100644 --- a/backend/utils/getFSStoragePath.ts +++ b/backend/utils/getFSStoragePath.ts @@ -1,9 +1,5 @@ import env from "../enviroment/env"; export const getFSStoragePath = () => { - if (env.docker) { - return "/data/"; - } else { - return env.fsDirectory; - } + return env.fsDirectory }; diff --git a/docker-compose-production.yml b/docker-compose.yml similarity index 79% rename from docker-compose-production.yml rename to docker-compose.yml index a3ea5b1..4efca9b 100644 --- a/docker-compose-production.yml +++ b/docker-compose.yml @@ -3,10 +3,11 @@ services: app: build: context: . - dockerfile: Dockerfile.production - container_name: mydrive_production + dockerfile: Dockerfile + container_name: mydrive + image: mydrive-image volumes: - - ${FS_DIRECTORY:-/dev/null}:/data + - /user/example/:/data ports: - "${HTTP_PORT:-3000}:3000" - "${HTTPS_PORT:-8080}:8080" @@ -14,7 +15,7 @@ services: - DOCKER=true - MONGODB_URL= - DB_TYPE= - - FS_DIRECTORY= + - FS_DIRECTORY=/data # Change this if you change the volume - S3_ID= - S3_KEY= - S3_BUCKET=