MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2024-12-27 15:45:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4093 from sschoen/Feature/docker

Browse Source 
added optional build arguments to disable minification/translation
This commit is contained in:
Ylian Saint-Hilaire 2022-06-08 09:54:55 -07:00 committed by GitHub
commit c5a72ace7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 92 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
docker/Dockerfile
View File

@ -11,16 +11,21 @@ RUN apk add --no-cache bash
FROM base AS builder
ARG DISABLE_TRANSLATE=""
ARG DISABLE_MINIFY=""
RUN mkdir /opt/meshcentral/meshcentral
COPY ./ /opt/meshcentral/meshcentral/
# minify files - first try throws Error: Cannot find module 'jsdom'
RUN cd meshcentral/translate && node translate.js minifyall; exit 0
RUN cd meshcentral/translate && node translate.js minifyall
# Extract all MeshCentral strings from web pages and generate the languages.json file. - first try throws Error: Cannot find module 'jsdom'
RUN cd meshcentral/translate && node translate.js extractall; exit 0;
RUN cd meshcentral/translate && node translate.js extractall
# minify files
RUN if [ "$DISABLE_MINIFY" != "yes" ] && [ "$DISABLE_MINIFY" != "YES" ]; then cd meshcentral/translate && node translate.js minifyall; fi
# translate
RUN cd meshcentral/translate && node translate.js translateall
RUN cd meshcentral/translate && node translate.js extractall
RUN if [ "$DISABLE_TRANSLATE" != "yes" ] && [ "$DISABLE_TRANSLATE" != "YES" ]; then cd meshcentral/translate && node translate.js translateall; fi
FROM base

75
docker/docker.build.sh Normal file
View File

@ -0,0 +1,75 @@
#!/bin/bash
MSG="";
PRUNE="false";
function appendOutput()
{
if [ -z "${MSG}" ]; then echo -e "\n" > /dev/tty; fi
ARGS=$@;
LINE="${ARGS}\n"
echo -e "${LINE}" > /dev/tty;
MSG="${MSG}${LINE}";
}
function runDockerBuild()
{
if [ "${PRUNE}" == "true" ]; then docker system prune -a -f; fi
STARTTS=$(date +%s);
ARGS=$@;
BUILD_CMD="docker build -f docker/Dockerfile --force-rm --no-cache ${ARGS} -t meshcentral .";
appendOutput "Current build: ${BUILD_CMD}";
${BUILD_CMD};
if [ $? -ne 0 ]; then exit $?; fi
ENDTS=$(date +%s);
DIFSEC=$((${ENDTS}-${STARTTS}));
if [ ${DIFSEC} -ge 60 ]; then
TMPMIN=$((${DIFSEC}/60));
TMPSEC=$((${DIFSEC}%60));
if [ ${TMPMIN} -ge 60 ]; then
TMPHOUR=$((${TMPMIN}/60));
TMPMIN=$((${TMPMIN}%60));
appendOutput "\tBuild time: ${TMPHOUR} hr ${TMPMIN} min ${TMPSEC} sec";
else appendOutput "\tBuild time: ${TMPMIN} min ${TMPSEC} sec"; fi
else appendOutput "\tBuild time: ${DIFSEC} sec"; fi
IMG_SIZE=$(docker image inspect meshcentral | grep -e "\"Size\"" | tr -d '",' | sed -E "s/\s*Size:\s*//");
expr $IMG_SIZE + 0;
appendOutput "\tImage size: ${IMG_SIZE} ($((${IMG_SIZE}/1024/1024))M)";
appendOutput "\n";
return 0;
}
parent_path=$(dirname -- $(dirname -- "$( readlink -f -- "$0"; )"));
if [ "${parent_path}" != "$(pwd -P)" ]; then
echo -e "change working directory to: ${parent_path}" > /dev/tty;
cd "${parent_path}";
fi
if ! [ -z $1 ] && [ "${1}" == "prune" ]; then PRUNE="true"; fi
runDockerBuild;
#runDockerBuild --build-arg DISABLE_MINIFY=yes;
#runDockerBuild --build-arg DISABLE_TRANSLATE=yes;
#runDockerBuild --build-arg DISABLE_MINIFY=yes --build-arg DISABLE_TRANSLATE=yes;
#runDockerBuild --build-arg INCLUDE_MONGOTOOLS=yes;
#runDockerBuild --build-arg INCLUDE_MONGOTOOLS=yes --build-arg DISABLE_MINIFY=yes;
#runDockerBuild --build-arg INCLUDE_MONGOTOOLS=yes --build-arg DISABLE_TRANSLATE=yes;
#runDockerBuild --build-arg INCLUDE_MONGOTOOLS=yes --build-arg DISABLE_MINIFY=yes --build-arg DISABLE_TRANSLATE=yes;
echo "";
echo -e $MSG;
exit 0;

7
docker/readme.md
View File

@ -21,6 +21,13 @@
> | --force-rm | Always remove intermediate containers |
> | -t meshcentral | Name and optionally a tag in the 'name:tag' format |
### Optional build arguments
> | Argument | Description |
> | :--- | :--- |
> | INCLUDE_MONGOTOOLS=yes | Includes mongodb-tools (mongodump, ...) in the image |
> | DISABLE_MINIFY=yes | Disables the minification of files |
> | DISABLE_TRANSLATE=yes | Disables the translation of files |
# Create folder-structure and files
```