Update Dockerfile
This commit is contained in:
@@ -8,7 +8,6 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
|
||||
|
||||
ENV PATH=/usr/local/go/bin:$PATH
|
||||
|
||||
# Added jq and wget so the ImageMagick build step works
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
build-essential git git-lfs ca-certificates curl xz-utils xorg-dev libgl1-mesa-dev libgtk-3-dev jq wget \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
@@ -62,7 +61,6 @@ RUN set -eux; \
|
||||
mkdir -p /out/danser/settings /out/danser/Songs /out/danser/Skins /out/danser/Replays /out/danser/videos; \
|
||||
rm -rf "$BUILD_DIR"
|
||||
|
||||
# ImageMagick build (kept from your original image)
|
||||
RUN set -eux; \
|
||||
IMAGICK_URL="$(curl -s https://api.github.com/repos/ImageMagick/ImageMagick/releases/latest | jq -r '.tarball_url')"; \
|
||||
mkdir -p /tmp/im; \
|
||||
@@ -91,7 +89,7 @@ ARG NODE_VERSION=20.11.1
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
ca-certificates \
|
||||
libglvnd0 libegl1 libgles2 libgl1 libgtk-3-0 libglib2.0-0 \
|
||||
git curl jq git-lfs \
|
||||
git curl jq git-lfs libgomp1 \
|
||||
xz-utils libpng16-16 libfreetype6 libfontconfig1 libxml2 ghostscript webp \
|
||||
fonts-urw-base35 fonts-noto-color-emoji fonts-dejavu-core \
|
||||
&& curl -fsSL "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz" -o /tmp/node.tar.xz \
|
||||
@@ -114,14 +112,10 @@ RUN groupadd -g 1000 appuser 2>/dev/null || true \
|
||||
&& id -u 1000 >/dev/null 2>&1 || useradd -u 1000 -g 1000 -m -s /bin/bash appuser \
|
||||
&& mkdir -p /app
|
||||
|
||||
# New-style copy from danser-builder and from /out/danser,
|
||||
# with ownership + perms set during copy (like your new image)
|
||||
COPY --from=danser-builder --chown=1000:1000 --chmod=755 /out/danser /app/danser
|
||||
|
||||
# Copy ImageMagick from builder stage (fixed stage name)
|
||||
COPY --from=danser-builder /tmp/im/usr/local/ /usr/local/
|
||||
|
||||
# LD_LIBRARY_PATH updated to include /app/danser/ffmpeg as in the new image
|
||||
ENV LD_LIBRARY_PATH=/app/danser:/app/danser/ffmpeg:/app/danser/ffmpeg/lib:/usr/local/nvidia/lib:/usr/local/nvidia/lib64:${LD_LIBRARY_PATH}
|
||||
ENV PATH=/app/danser/ffmpeg/bin:${PATH}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user