Optimize build: Kaniko cache flags, split Dockerfile stages, install-tools script
- Kaniko: --cache-ttl=168h, --snapshot-mode=redo, --compressed-caching=false - Dockerfile: Split server-build into server-deps + server-build for better layer caching - Replace rm+reinstall node_modules with npm prune --omit=dev - Move ffmpeg/yt-dlp install to tools/install-tools.sh (single RUN layer) - Remove separate ffmpeg-fetch stage and inline curl/yt-dlp install - Remove $CI_COMMIT_SHA tag destination (unused, saves push time) - bump-version: alpine/git image instead of alpine + apk add git Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
parent
6c57419959
commit
259c87bfd3
3 changed files with 37 additions and 21 deletions
|
|
@ -47,13 +47,12 @@ docker-build:
|
||||||
CHANNEL="dev"
|
CHANNEL="dev"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
DESTINATIONS="--destination=$IMAGE_NAME:$CI_COMMIT_SHA --destination=$IMAGE_NAME:$TAG"
|
DESTINATIONS="--destination=$IMAGE_NAME:$TAG"
|
||||||
if [ "$CI_COMMIT_REF_NAME" = "main" ]; then
|
if [ "$CI_COMMIT_REF_NAME" = "main" ]; then
|
||||||
DESTINATIONS="$DESTINATIONS --destination=$IMAGE_NAME:latest"
|
DESTINATIONS="$DESTINATIONS --destination=$IMAGE_NAME:latest"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Building for channel $CHANNEL with version $VERSION and tag $TAG"
|
echo "Building for channel $CHANNEL with version $VERSION and tag $TAG"
|
||||||
echo "Using registry image: $IMAGE_NAME"
|
|
||||||
|
|
||||||
/kaniko/executor \
|
/kaniko/executor \
|
||||||
--context "$CI_PROJECT_DIR" \
|
--context "$CI_PROJECT_DIR" \
|
||||||
|
|
@ -62,6 +61,9 @@ docker-build:
|
||||||
--build-arg "VITE_APP_VERSION=$VERSION" \
|
--build-arg "VITE_APP_VERSION=$VERSION" \
|
||||||
--cache=true \
|
--cache=true \
|
||||||
--cache-repo="$IMAGE_NAME/cache" \
|
--cache-repo="$IMAGE_NAME/cache" \
|
||||||
|
--cache-ttl=168h \
|
||||||
|
--snapshot-mode=redo \
|
||||||
|
--compressed-caching=false \
|
||||||
--insecure-registry=$INTERNAL_REGISTRY \
|
--insecure-registry=$INTERNAL_REGISTRY \
|
||||||
$DESTINATIONS
|
$DESTINATIONS
|
||||||
|
|
||||||
|
|
@ -106,12 +108,11 @@ deploy:
|
||||||
|
|
||||||
bump-version:
|
bump-version:
|
||||||
stage: bump-version
|
stage: bump-version
|
||||||
image: alpine:latest
|
image: alpine/git:latest
|
||||||
needs: [deploy]
|
needs: [deploy]
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_COMMIT_BRANCH == "main" && $CI_COMMIT_TITLE !~ /\[skip ci\]/
|
- if: $CI_COMMIT_BRANCH == "main" && $CI_COMMIT_TITLE !~ /\[skip ci\]/
|
||||||
script:
|
script:
|
||||||
- apk add --no-cache git
|
|
||||||
- |
|
- |
|
||||||
git config user.name "GitLab CI"
|
git config user.name "GitLab CI"
|
||||||
git config user.email "ci@adriahub.de"
|
git config user.email "ci@adriahub.de"
|
||||||
|
|
|
||||||
23
Dockerfile
23
Dockerfile
|
|
@ -9,37 +9,26 @@ ENV VITE_BUILD_CHANNEL=$VITE_BUILD_CHANNEL
|
||||||
ENV VITE_APP_VERSION=$VITE_APP_VERSION
|
ENV VITE_APP_VERSION=$VITE_APP_VERSION
|
||||||
RUN npm run build
|
RUN npm run build
|
||||||
|
|
||||||
FROM node:24-slim AS server-build
|
FROM node:24-slim AS server-deps
|
||||||
WORKDIR /app/server
|
WORKDIR /app/server
|
||||||
RUN apt-get update && apt-get install -y python3 make g++ && rm -rf /var/lib/apt/lists/*
|
RUN apt-get update && apt-get install -y python3 make g++ && rm -rf /var/lib/apt/lists/*
|
||||||
COPY server/package*.json ./
|
COPY server/package*.json ./
|
||||||
RUN npm install --no-audit --no-fund
|
RUN npm install --no-audit --no-fund
|
||||||
|
|
||||||
|
FROM server-deps AS server-build
|
||||||
COPY server/ .
|
COPY server/ .
|
||||||
RUN npm run build
|
RUN npm run build
|
||||||
RUN rm -rf node_modules && npm install --omit=dev --no-audit --no-fund
|
RUN npm prune --omit=dev
|
||||||
|
|
||||||
FROM debian:bookworm-slim AS ffmpeg-fetch
|
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends curl xz-utils ca-certificates \
|
|
||||||
&& rm -rf /var/lib/apt/lists/* \
|
|
||||||
&& curl -L https://github.com/yt-dlp/FFmpeg-Builds/releases/download/latest/ffmpeg-master-latest-linux64-gpl.tar.xz \
|
|
||||||
-o /tmp/ffmpeg.tar.xz \
|
|
||||||
&& mkdir -p /tmp/ffmpeg \
|
|
||||||
&& tar -xJf /tmp/ffmpeg.tar.xz -C /tmp/ffmpeg --strip-components=2 --wildcards "*/bin/ffmpeg" \
|
|
||||||
&& chmod +x /tmp/ffmpeg/ffmpeg \
|
|
||||||
&& rm /tmp/ffmpeg.tar.xz
|
|
||||||
|
|
||||||
FROM node:24-slim AS runtime
|
FROM node:24-slim AS runtime
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
ENV NODE_ENV=production PORT=8080 DATA_DIR=/data
|
ENV NODE_ENV=production PORT=8080 DATA_DIR=/data
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates curl \
|
|
||||||
&& curl -L https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp_linux -o /usr/local/bin/yt-dlp \
|
|
||||||
&& chmod a+rx /usr/local/bin/yt-dlp \
|
|
||||||
&& apt-get purge -y curl && apt-get autoremove -y && rm -rf /var/lib/apt/lists/*
|
|
||||||
COPY --from=ffmpeg-fetch /tmp/ffmpeg/ffmpeg /usr/local/bin/ffmpeg
|
|
||||||
COPY --from=server-build /app/server/dist ./server/dist
|
COPY --from=server-build /app/server/dist ./server/dist
|
||||||
COPY --from=server-build /app/server/node_modules ./server/node_modules
|
COPY --from=server-build /app/server/node_modules ./server/node_modules
|
||||||
COPY --from=server-build /app/server/package.json ./server/package.json
|
COPY --from=server-build /app/server/package.json ./server/package.json
|
||||||
COPY --from=web-build /app/web/dist ./web/dist
|
COPY --from=web-build /app/web/dist ./web/dist
|
||||||
|
COPY tools/install-tools.sh /tmp/install-tools.sh
|
||||||
|
RUN chmod +x /tmp/install-tools.sh && /tmp/install-tools.sh && rm /tmp/install-tools.sh
|
||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
VOLUME ["/data"]
|
VOLUME ["/data"]
|
||||||
CMD ["node", "server/dist/index.js"]
|
CMD ["node", "server/dist/index.js"]
|
||||||
|
|
|
||||||
26
tools/install-tools.sh
Normal file
26
tools/install-tools.sh
Normal file
|
|
@ -0,0 +1,26 @@
|
||||||
|
#!/bin/bash
|
||||||
|
set -e
|
||||||
|
|
||||||
|
echo "[install-tools] Installing ffmpeg + yt-dlp..."
|
||||||
|
|
||||||
|
apt-get update && apt-get install -y --no-install-recommends curl ca-certificates xz-utils \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
# FFmpeg (static build from yt-dlp project)
|
||||||
|
curl -L https://github.com/yt-dlp/FFmpeg-Builds/releases/download/latest/ffmpeg-master-latest-linux64-gpl.tar.xz \
|
||||||
|
-o /tmp/ffmpeg.tar.xz
|
||||||
|
mkdir -p /tmp/ffmpeg
|
||||||
|
tar -xJf /tmp/ffmpeg.tar.xz -C /tmp/ffmpeg --strip-components=2 --wildcards "*/bin/ffmpeg"
|
||||||
|
mv /tmp/ffmpeg/ffmpeg /usr/local/bin/ffmpeg
|
||||||
|
chmod +x /usr/local/bin/ffmpeg
|
||||||
|
rm -rf /tmp/ffmpeg /tmp/ffmpeg.tar.xz
|
||||||
|
|
||||||
|
# yt-dlp (standalone linux binary, no Python needed)
|
||||||
|
curl -L https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp_linux \
|
||||||
|
-o /usr/local/bin/yt-dlp
|
||||||
|
chmod +x /usr/local/bin/yt-dlp
|
||||||
|
|
||||||
|
# Cleanup curl/xz (keep ca-certificates for HTTPS)
|
||||||
|
apt-get purge -y curl xz-utils && apt-get autoremove -y && rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
echo "[install-tools] Done. ffmpeg=$(ffmpeg -version 2>&1 | head -1), yt-dlp=$(yt-dlp --version 2>/dev/null || echo 'ok')"
|
||||||
Loading…
Add table
Add a link
Reference in a new issue