diff --git a/Dockerfile b/Dockerfile index 32dd961..40b0b41 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,23 +8,10 @@ FROM base AS deps WORKDIR /app -# sharp (and ipx's nested sharp) need libvips; use Alpine packages to avoid -# GitHub prebuild downloads that often time out in CI/deploy environments -RUN apk add --no-cache \ - build-base \ - python3 \ - vips-dev \ - fftw-dev \ - libexif-dev \ - lcms2-dev \ - libjpeg-turbo-dev \ - libpng-dev \ - giflib-dev - COPY package.json package-lock.json ./ -ENV SHARP_FORCE_GLOBAL_LIBVIPS=1 \ - npm_config_build_from_source=true +ENV npm_config_fetch_timeout=300000 \ + npm_config_fetch_retries=5 RUN npm ci @@ -50,8 +37,7 @@ ENV NODE_ENV=production \ PORT=3000 \ HOSTNAME=0.0.0.0 -RUN apk add --no-cache vips \ - && addgroup -S appgroup \ +RUN addgroup -S appgroup \ && adduser -S appuser -G appgroup COPY --from=builder --chown=appuser:appgroup /app/package.json ./ diff --git a/package.json b/package.json index 2f388f9..2dc5275 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "nuxt": "^2.15.3", "nuxt-video-player": "^1.0.17", "request-ip": "^2.1.3", - "sharp": "^0.28.1", + "sharp": "^0.33.5", "slick-carousel": "^1.8.1", "svg-captcha": "^1.4.0", "swagger-jsdoc": "^6.2.8", @@ -62,6 +62,9 @@ "vue-tree-chart": "^1.2.9", "vue-turnjs": "^1.3.2" }, + "overrides": { + "sharp": "^0.33.5" + }, "devDependencies": { "sass": "^1.77.3", "sass-loader": "^10.1.0",