From 5d30ba93806cc9a2411ea1ed8461c90de3bc376d Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sun, 13 Dec 2020 14:38:04 +0100 Subject: [PATCH] Fix Docker build Add webp support to the Docker build and remove scripty Signed-off-by: Thomas Citharel --- docker/production/Dockerfile | 2 +- js/package.json | 3 +-- js/yarn.lock | 24 +----------------------- 3 files changed, 3 insertions(+), 26 deletions(-) diff --git a/docker/production/Dockerfile b/docker/production/Dockerfile index cc67e3f16..ca01e242b 100644 --- a/docker/production/Dockerfile +++ b/docker/production/Dockerfile @@ -1,7 +1,7 @@ # First build the application assets FROM node:alpine as assets -RUN apk add --no-cache python build-base +RUN apk add --no-cache python build-base libwebp-tools bash imagemagick ncurses COPY js . RUN yarn install \ diff --git a/js/package.json b/js/package.json index 8598a0d92..27ab4d13d 100644 --- a/js/package.json +++ b/js/package.json @@ -5,7 +5,7 @@ "scripts": { "serve": "vue-cli-service serve", "build:assets": "vue-cli-service build --modern", - "build:pictures": "scripty", + "build:pictures": "bash ./scripts/build/pictures.sh", "build": "yarn run build:assets && yarn run build:pictures", "test:unit": "LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 vue-cli-service test:unit", "test:e2e": "vue-cli-service test:e2e", @@ -89,7 +89,6 @@ "prettier-eslint": "^12.0.0", "sass": "^1.29.0", "sass-loader": "^10.0.1", - "scripty": "^2.0.0", "typescript": "~4.1.2", "vue-cli-plugin-svg": "~0.1.3", "vue-i18n-extract": "^1.0.2", diff --git a/js/yarn.lock b/js/yarn.lock index ff83d75cf..2ad9ab1c6 100644 --- a/js/yarn.lock +++ b/js/yarn.lock @@ -2701,7 +2701,7 @@ async@2.6.1: dependencies: lodash "^4.17.10" -async@^2.6.1, async@^2.6.2: +async@^2.6.2: version "2.6.3" resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff" integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg== @@ -10489,11 +10489,6 @@ resolve-dir@^1.0.0, resolve-dir@^1.0.1: expand-tilde "^2.0.0" global-modules "^1.0.0" -resolve-from@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57" - integrity sha1-lICrIOlP+h2egKgEx+oUdhGWa1c= - resolve-from@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748" @@ -10504,13 +10499,6 @@ resolve-from@^4.0.0: resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== -resolve-pkg@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/resolve-pkg/-/resolve-pkg-1.0.0.tgz#e19a15e78aca2e124461dc92b2e3943ef93494d9" - integrity sha1-4ZoV54rKLhJEYdySsuOUPvk0lNk= - dependencies: - resolve-from "^2.0.0" - resolve-url@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" @@ -10751,16 +10739,6 @@ schema-utils@^3.0.0: ajv "^6.12.5" ajv-keywords "^3.5.2" -scripty@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/scripty/-/scripty-2.0.0.tgz#25761bb2e237a7563f705d87357db07791d38459" - integrity sha512-vbd4FPeuNwYNGtRtYa1wDZLPCx5PpW6VrldCEiBGqPz7Je1xZOgNvVPD2axymvqNghBIRiXxAU+JwYrOzvuLJg== - dependencies: - async "^2.6.1" - glob "^7.0.3" - lodash "^4.17.11" - resolve-pkg "^1.0.0" - select-hose@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"