From 37e602e6891d9ee3e92d7311e5b29f6ba48d6765 Mon Sep 17 00:00:00 2001 From: Sherif Metwally Date: Sat, 10 Dec 2022 09:24:01 +0200 Subject: [PATCH] fix more occurrences of meshcentral-backup typos and minor markdown lint fixes --- docker/Dockerfile | 8 ++++---- docker/readme.md | 16 ++++++++++------ 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index b1dceb69..939bb7a3 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -10,11 +10,11 @@ ARG DISABLE_TRANSLATE="" RUN if ! [ -z "$DISABLE_MINIFY" ] && [ "$DISABLE_MINIFY" != "yes" ] && [ "$DISABLE_MINIFY" != "YES" ] \ && [ "$DISABLE_MINIFY" != "true" ] && [ "$DISABLE_MINIFY" != "TRUE" ]; then \ - echo -e "\e[0;31;49mInvalid value for build argument DISABLE_MINIFY, possible values: yes/true\e[;0m"; exit 1; \ + echo -e "\e[0;31;49mInvalid value for build argument DISABLE_MINIFY, possible values: yes/true\e[;0m"; exit 1; \ fi RUN if ! [ -z "$DISABLE_TRANSLATE" ] && [ "$DISABLE_TRANSLATE" != "yes" ] && [ "$DISABLE_TRANSLATE" != "YES" ] \ && [ "$DISABLE_TRANSLATE" != "true" ] && [ "$DISABLE_TRANSLATE" != "TRUE" ]; then \ - echo -e "\e[0;31;49mInvalid value for build argument DISABLE_TRANSLATE, possible values: yes/true\e[;0m"; exit 1; \ + echo -e "\e[0;31;49mInvalid value for build argument DISABLE_TRANSLATE, possible values: yes/true\e[;0m"; exit 1; \ fi # install translate/minify modules if need too @@ -71,7 +71,7 @@ ENV REVERSE_PROXY_TLS_PORT="" RUN if ! [ -z "$INCLUDE_MONGODBTOOLS" ] && [ "$INCLUDE_MONGODBTOOLS" != "yes" ] && [ "$INCLUDE_MONGODBTOOLS" != "YES" ] \ && [ "$INCLUDE_MONGODBTOOLS" != "true" ] && [ "$INCLUDE_MONGODBTOOLS" != "TRUE" ]; then \ - echo -e "\e[0;31;49mInvalid value for build argument INCLUDE_MONGODBTOOLS, possible values: yes/true\e[;0m"; exit 1; \ + echo -e "\e[0;31;49mInvalid value for build argument INCLUDE_MONGODBTOOLS, possible values: yes/true\e[;0m"; exit 1; \ fi RUN if ! [ -z "$INCLUDE_MONGODBTOOLS" ]; then apk add --no-cache mongodb-tools; fi @@ -93,6 +93,6 @@ EXPOSE 80 443 4433 VOLUME /opt/meshcentral/meshcentral-data VOLUME /opt/meshcentral/meshcentral-files VOLUME /opt/meshcentral/meshcentral-web -VOLUME /opt/meshcentral/meshcentral-backup +VOLUME /opt/meshcentral/meshcentral-backups CMD ["bash", "/opt/meshcentral/startup.sh"] diff --git a/docker/readme.md b/docker/readme.md index 76995028..63ee201e 100644 --- a/docker/readme.md +++ b/docker/readme.md @@ -10,8 +10,10 @@ | - docker-compose.yml ``` -# Templates: -## .env: +# Templates + +## .env + ```ini NODE_ENV=production @@ -42,7 +44,8 @@ LOCALSESSIONRECORDING=false MINIFY=true ``` -## docker-compose.yml: +## docker-compose.yml + ```yaml version: '3' @@ -63,12 +66,13 @@ services: # where file uploads for users live - ./meshcentral/user_files:/opt/meshcentral/meshcentral-files # location for the meshcentral-backups - this should be mounted to an external storage - - ./meshcentral/backup:/opt/meshcentral/meshcentral-backup + - ./meshcentral/backup:/opt/meshcentral/meshcentral-backups # location for site customization files - ./meshcentral/web:/opt/meshcentral/meshcentral-web ``` -## docker-compose.yml mongodb: +## docker-compose.yml mongodb + ```yaml version: '3' @@ -107,7 +111,7 @@ services: # where file uploads for users live - ./meshcentral/user_files:/opt/meshcentral/meshcentral-files # location for the meshcentral-backups - this should be mounted to an external storage - - ./meshcentral/backup:/opt/meshcentral/meshcentral-backup + - ./meshcentral/backup:/opt/meshcentral/meshcentral-backups # location for site customization files - ./meshcentral/web:/opt/meshcentral/meshcentral-web networks: