[docker] forward arguments to 'docker build' command
Simon Schön committed
Jul 2, 2022 at 19:50 UTC
cd5fabf53edfcf1a219d16d5c953db3c1a65725d
1 file changed
+28
-10
docker/docker.build.sh
+28
-10
@@ -30,6 +30,9 @@ function runDockerBuild()
30
31
if [ -z "${LOG_FILE}" ]; then ${BUILD_CMD}; else ${BUILD_CMD} &>> "${LOG_FILE}"; fi
32
if [ $? -ne 0 ]; then exit $?; fi
33
+
34
+ IMAGEID=$(docker images --format "{{.ID}} {{.CreatedAt}}" | sort -rk 2 | awk 'NR==1{print $1}');
35
+ appendOutput "\tImageId: ${IMAGEID}";
36
37
ENDTS=$(date +%s);
38
DIFSEC=$((${ENDTS}-${STARTTS}));
@@ -45,7 +48,7 @@ function runDockerBuild()
48
else appendOutput "\tBuild time: ${TMPMIN} min ${TMPSEC} sec"; fi
49
else appendOutput "\tBuild time: ${DIFSEC} sec"; fi
50
48
- IMG_SIZE=$(docker image inspect meshcentral | grep -e "\"Size\"" | tr -d '",' | sed -E "s/\s*Size:\s*//");
51
+ IMG_SIZE=$(docker image inspect ${IMAGEID} | grep -o '"Size":\s*[^,]*' | cut -f2- -d ':' | tr -d ' ');
52
expr $IMG_SIZE + 0 > /dev/null;
53
appendOutput "\tImage size: ${IMG_SIZE} ($((${IMG_SIZE}/1024/1024))M)\n";
54
@@ -58,17 +61,32 @@ if [ "${parent_path}" != "$(pwd -P)" ]; then
61
cd "${parent_path}";
62
fi
63
61
-if ! [ -z $1 ] && [ "${1}" == "prune" ]; then PRUNE="true"; fi
64
+if ! [ -z $1 ]; then
65
+ for arg in "$@"
66
+ do
67
+ case "${arg}" in
68
+ --prune)
69
+ PRUNE="true";
70
+ shift 1;
71
+ ;;
72
+ *)
73
+ break;
74
+ ;;
75
+ esac
76
+ done
77
+fi
78
+
79
+MAINARGS=$@;
80
63
-#runDockerBuild --build-arg DISABLE_MINIFY=yes --build-arg DISABLE_TRANSLATE=yes;
64
-#runDockerBuild --build-arg DISABLE_TRANSLATE=yes;
65
-#runDockerBuild --build-arg DISABLE_MINIFY=yes;
66
-runDockerBuild;
81
+#runDockerBuild --build-arg DISABLE_MINIFY=yes --build-arg DISABLE_TRANSLATE=yes ${MAINARGS};
82
+#runDockerBuild --build-arg DISABLE_TRANSLATE=yes ${MAINARGS};
83
+#runDockerBuild --build-arg DISABLE_MINIFY=yes ${MAINARGS};
84
+runDockerBuild ${MAINARGS};
85
68
-#runDockerBuild --build-arg INCLUDE_MONGODBTOOLS=yes --build-arg DISABLE_MINIFY=yes --build-arg DISABLE_TRANSLATE=yes;
69
-#runDockerBuild --build-arg INCLUDE_MONGODBTOOLS=yes --build-arg DISABLE_TRANSLATE=yes;
70
-#runDockerBuild --build-arg INCLUDE_MONGODBTOOLS=yes --build-arg DISABLE_MINIFY=yes;
71
-#runDockerBuild --build-arg INCLUDE_MONGODBTOOLS=yes;
86
+#runDockerBuild --build-arg INCLUDE_MONGODBTOOLS=yes --build-arg DISABLE_MINIFY=yes --build-arg DISABLE_TRANSLATE=yes ${MAINARGS};
87
+#runDockerBuild --build-arg INCLUDE_MONGODBTOOLS=yes --build-arg DISABLE_TRANSLATE=yes ${MAINARGS};
88
+#runDockerBuild --build-arg INCLUDE_MONGODBTOOLS=yes --build-arg DISABLE_MINIFY=yes ${MAINARGS};
89
+#runDockerBuild --build-arg INCLUDE_MONGODBTOOLS=yes ${MAINARGS};
90
91
echo "";
92
echo -e "${MSG}";