From 1b3a497c55481c975060860e60b3654f62d82c2f Mon Sep 17 00:00:00 2001 From: Stepan Usatiuk Date: Fri, 13 Jan 2023 10:25:54 +0100 Subject: [PATCH] merge ENV's together in Dockerfile --- Dockerfile | 26 +++++++++++++------------- README.md | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6a5ec82..e48dc5b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,24 +18,24 @@ RUN npm run build WORKDIR ../ #ENV PORT=8080 -ENV DATA_DIR=data - -ENV TYPEORM_CONNECTION=mariadb #ENV TYPEORM_HOST=localhost #ENV TYPEORM_USERNAME=root #ENV TYPEORM_PASSWORD=admin #ENV TYPEORM_DATABASE=test #ENV TYPEORM_PORT=3000 -ENV TYPEORM_SYNCHRONIZE=false -ENV TYPEORM_LOGGING=false -ENV TYPEORM_ENTITIES=src/entity/**/*.ts -ENV TYPEORM_ENTITIES_DIR=src/entity -ENV TYPEORM_MIGRATIONS=src/migration/**/*.ts -ENV TYPEORM_MIGRATIONS_DIR=src/migration -ENV TYPEORM_SUBSCRIBERS=src/subscriber/**/*.ts -ENV TYPEORM_SUBSCRIBERS_DIR=src/subscriber -ENV TYPEORM_DRIVER_EXTRA='{"charset": "utf8mb4"}' -ENV NODE_ENV=production + +ENV DATA_DIR=data\ + TYPEORM_CONNECTION=mariadb\ + TYPEORM_SYNCHRONIZE=false\ + TYPEORM_LOGGING=false\ + TYPEORM_ENTITIES=src/entity/**/*.ts\ + TYPEORM_ENTITIES_DIR=src/entity\ + TYPEORM_MIGRATIONS=src/migration/**/*.ts\ + TYPEORM_MIGRATIONS_DIR=src/migration\ + TYPEORM_SUBSCRIBERS=src/subscriber/**/*.ts\ + TYPEORM_SUBSCRIBERS_DIR=src/subscriber\ + TYPEORM_DRIVER_EXTRA='{"charset": "utf8mb4"}'\ + NODE_ENV=production #EXPOSE 8080 diff --git a/README.md b/README.md index ad2f8cb..d7fb5ab 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ docker-compose example in `dockercomposeexample` folder * `HTTPS` (`"yes"`/`"no"`) - whether the server enforces HTTPS or not -* `SIGNUP_ALLOWED` (`"yes"`/`"no"`) - whether signups are allowed or not, persistent +* `SIGNUP_ALLOWED` (`"yes"`/`"no"`) - whether signups are allowed or not, persistent (but the first signup is always allowed) * `API_ROOT`