From 291f80949c7ec44966b9d9c31120342cf524f52b Mon Sep 17 00:00:00 2001 From: Zoey Date: Thu, 2 May 2024 12:09:56 +0200 Subject: [PATCH] Update Dockerfile Signed-off-by: Zoey --- Dockerfile | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index a3f529d..ed67d7e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,29 +5,35 @@ ARG PT_VERSION=v6.1.0 \ TARGETARCH RUN apk upgrade --no-cache -a && \ - apk add --no-cache ca-certificates bash nodejs-current yarn npm git && \ + apk add --no-cache ca-certificates bash nodejs yarn npm git && \ yarn global add clean-modules && \ git clone --recursive https://github.com/Chocobozzz/PeerTube --branch "$PT_VERSION" /app && \ sed -i "s|gosu|su-exec|g" /app/support/docker/production/entrypoint.sh && \ if [ "$TARGETARCH" = "amd64" ]; then \ cd /app/client && \ npm_config_target_platform=linux npm_config_target_arch=x64 yarn install --no-lockfile && \ + clean-modules --yes && \ cd /app && \ npm_config_target_platform=linux npm_config_target_arch=x64 yarn install --no-lockfile && \ + clean-modules --yes && \ npm_config_target_platform=linux npm_config_target_arch=x64 npm run build && \ + clean-modules --yes && \ rm -r /app/client/.angular /app/client/node_modules /app/node_modules && \ - npm_config_target_platform=linux npm_config_target_arch=x64 yarn install --no-lockfile --production; \ + npm_config_target_platform=linux npm_config_target_arch=x64 yarn install --no-lockfile --production && \ + clean-modules --yes; \ elif [ "$TARGETARCH" = "arm64" ]; then \ cd /app/client && \ npm_config_target_platform=linux npm_config_target_arch=arm64 yarn install --no-lockfile && \ + clean-modules --yes && \ cd /app && \ npm_config_target_platform=linux npm_config_target_arch=arm64 yarn install --no-lockfile && \ + clean-modules --yes && \ npm_config_target_platform=linux npm_config_target_arch=arm64 npm run build && \ + clean-modules --yes && \ rm -r /app/client/.angular /app/client/node_modules /app/node_modules && \ - npm_config_target_platform=linux npm_config_target_arch=arm64 yarn install --no-lockfile --production; \ + npm_config_target_platform=linux npm_config_target_arch=arm64 yarn install --no-lockfile --production && \ + clean-modules --yes; \ fi && \ - cd /app && clean-modules --yes && \ - cd /app/client && clean-modules --yes && \ yarn cache clean --all FROM alpine:3.19.1 @@ -36,7 +42,7 @@ COPY --from=build /app /app WORKDIR /app # Install dependencies -RUN apk add --no-cache ca-certificates tzdata tini ffmpeg su-exec shadow nodejs-current && \ +RUN apk add --no-cache ca-certificates tzdata tini ffmpeg su-exec shadow nodejs && \ # Add peertube user groupadd -r peertube && \ useradd -r -g peertube -m peertube && \