From d55caefda0e1f3bcf66f7d5c6cf0bfb0c3db2e18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=91cze=20Bence?= Date: Sat, 30 May 2020 01:51:13 +0200 Subject: [PATCH] MAPG-78 use svgo instead of html-minifier --- docker/Dockerfile | 2 +- scripts/minify.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index f75e34b..2e68c87 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -23,7 +23,7 @@ RUN ./install-composer.sh # Install Node.js and required packages RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - RUN apt install -y nodejs -RUN npm install -g uglify-js clean-css-cli html-minifier +RUN npm install -g uglify-js clean-css-cli svgo EXPOSE 80 VOLUME /var/www/mapguesser diff --git a/scripts/minify.sh b/scripts/minify.sh index 79c1bb5..24b9398 100755 --- a/scripts/minify.sh +++ b/scripts/minify.sh @@ -6,4 +6,4 @@ ROOT_DIR=$(dirname $(readlink -f "$0"))/.. uglifyjs ${ROOT_DIR}/public/static/js/mapguesser.js -c -m -o ${ROOT_DIR}/public/static/js/mapguesser.js cleancss ${ROOT_DIR}/public/static/css/mapguesser.css -o ${ROOT_DIR}/public/static/css/mapguesser.css -html-minifier ${ROOT_DIR}/public/static/img/loading.svg --collapse-whitespace --remove-comments -o ${ROOT_DIR}/public/static/img/loading.svg +svgo ${ROOT_DIR}/public/static/img/loading.svg -o ${ROOT_DIR}/public/static/img/loading.svg