dev: switch to fully containerized Docker Compose workflow
- Replace tmux setup with a full Docker Compose development stack - Update backend Dockerfile to use `cargo-chef` caching and `supervisord` - Containerize frontend development server - Update tests to run in isolated containers - Remove legacy `papercrate.tmux`
This commit is contained in:
@@ -0,0 +1 @@
|
||||
target/
|
||||
+177
-82
@@ -1,82 +1,192 @@
|
||||
# syntax=docker/dockerfile:1.7
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# Global Arguments
|
||||
# ------------------------------------------------------------------------------
|
||||
ARG RUST_VERSION=1
|
||||
FROM --platform=$BUILDPLATFORM rust:${RUST_VERSION}-slim AS builder
|
||||
ARG RUNTIME_DEPS="ocrmypdf tesseract-ocr ghostscript qpdf ffmpeg"
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# Base Stage: Shared Logic (PDFium)
|
||||
# ------------------------------------------------------------------------------
|
||||
FROM --platform=$BUILDPLATFORM rust:${RUST_VERSION}-slim AS base
|
||||
ARG RUNTIME_DEPS
|
||||
WORKDIR /app
|
||||
|
||||
# Install PDFium
|
||||
ARG TARGETARCH
|
||||
RUN set -eux; \
|
||||
case "${TARGETARCH}" in \
|
||||
amd64|x86_64) pdfium_package=pdfium-linux-x64.tgz ;; \
|
||||
arm64|aarch64) pdfium_package=pdfium-linux-arm64.tgz ;; \
|
||||
*) echo "Unsupported TARGETARCH: ${TARGETARCH}" >&2; exit 1 ;; \
|
||||
esac; \
|
||||
apt-get update && apt-get install -y --no-install-recommends curl ca-certificates; \
|
||||
curl -fsSL "https://github.com/bblanchon/pdfium-binaries/releases/latest/download/${pdfium_package}" -o /tmp/pdfium.tgz; \
|
||||
mkdir -p /tmp/pdfium; \
|
||||
tar -xzf /tmp/pdfium.tgz -C /tmp/pdfium --strip-components=1; \
|
||||
pdfium_so="$(find /tmp/pdfium -name libpdfium.so -type f | head -n1)"; \
|
||||
[ -n "${pdfium_so}" ]; \
|
||||
mkdir -p /usr/local/lib; \
|
||||
cp "${pdfium_so}" /usr/local/lib/libpdfium.so; \
|
||||
rm -rf /tmp/pdfium.tgz /tmp/pdfium
|
||||
|
||||
# Install common build dependencies AND runtime deps (for dev/testing)
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
build-essential \
|
||||
pkg-config \
|
||||
libssl-dev \
|
||||
libpq-dev \
|
||||
libjpeg-dev \
|
||||
libpng-dev \
|
||||
zlib1g-dev \
|
||||
ca-certificates \
|
||||
curl \
|
||||
git \
|
||||
${RUNTIME_DEPS} \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# Development Stage
|
||||
# ------------------------------------------------------------------------------
|
||||
# ------------------------------------------------------------------------------
|
||||
# Chef Stage: Install cargo-chef (used for caching)
|
||||
# ------------------------------------------------------------------------------
|
||||
FROM base AS chef
|
||||
RUN cargo install cargo-chef
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# Planner Stage: Compute lockfile recipe
|
||||
# ------------------------------------------------------------------------------
|
||||
FROM chef AS planner
|
||||
COPY . .
|
||||
RUN cargo chef prepare --recipe-path recipe.json
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# Cacher Stage: Build dependencies only
|
||||
# ------------------------------------------------------------------------------
|
||||
FROM chef AS cacher
|
||||
ENV CARGO_TARGET_DIR=/cargo-target
|
||||
COPY --from=planner /app/recipe.json recipe.json
|
||||
# Build dependencies (including test deps) based on the recipe
|
||||
RUN cargo chef cook --tests --recipe-path recipe.json
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# Development Stage
|
||||
# ------------------------------------------------------------------------------
|
||||
FROM base AS development
|
||||
WORKDIR /app
|
||||
|
||||
# Install additional development tools
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
procps \
|
||||
postgresql-client \
|
||||
supervisor \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install diesel-cli for migrations
|
||||
RUN cargo install diesel_cli --no-default-features --features postgres
|
||||
|
||||
# Install cargo-watch for hot reloading
|
||||
RUN cargo install cargo-watch
|
||||
|
||||
# Setup Cache
|
||||
ENV CARGO_TARGET_DIR=/cargo-target
|
||||
COPY --from=cacher /cargo-target /cargo-target
|
||||
COPY --from=cacher /usr/local/cargo /usr/local/cargo
|
||||
|
||||
# Copy PDFium from base
|
||||
COPY --from=base /usr/local/lib/libpdfium.so /usr/local/lib/libpdfium.so
|
||||
ENV LD_LIBRARY_PATH=/usr/local/lib
|
||||
RUN ldconfig
|
||||
|
||||
ENV RUST_LOG=info
|
||||
CMD ["./run-dev.sh"]
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# Production Builder Stage
|
||||
# ------------------------------------------------------------------------------
|
||||
# We restart from base to keep the image clean, but copy PDFium if needed for build/tests
|
||||
FROM base AS builder
|
||||
ARG TARGETARCH
|
||||
ENV TARGETARCH=${TARGETARCH}
|
||||
WORKDIR /app
|
||||
|
||||
# Resolve cross-compilation target script
|
||||
RUN cat <<'SCRIPT' >/usr/local/bin/resolve-target.sh
|
||||
#!/bin/sh
|
||||
set -e
|
||||
case "$1" in
|
||||
amd64)
|
||||
echo x86_64-unknown-linux-gnu
|
||||
;;
|
||||
arm64)
|
||||
echo aarch64-unknown-linux-gnu
|
||||
;;
|
||||
*)
|
||||
echo "Unsupported TARGETARCH: $1" >&2
|
||||
exit 1
|
||||
;;
|
||||
amd64) echo x86_64-unknown-linux-gnu ;;
|
||||
arm64) echo aarch64-unknown-linux-gnu ;;
|
||||
*) echo "Unsupported TARGETARCH: $1" >&2; exit 1 ;;
|
||||
esac
|
||||
SCRIPT
|
||||
RUN chmod +x /usr/local/bin/resolve-target.sh
|
||||
|
||||
ENV PKG_CONFIG_ALLOW_CROSS=1 \
|
||||
CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc \
|
||||
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc \
|
||||
PKG_CONFIG_LIBDIR_aarch64_unknown_linux_gnu=/usr/lib/aarch64-linux-gnu/pkgconfig \
|
||||
PKG_CONFIG_PATH_aarch64_unknown_linux_gnu=/usr/lib/aarch64-linux-gnu/pkgconfig \
|
||||
PKG_CONFIG_SYSROOT_DIR_aarch64_unknown_linux_gnu=/usr/aarch64-linux-gnu \
|
||||
OPENSSL_DIR_aarch64_unknown_linux_gnu=/usr/lib/aarch64-linux-gnu \
|
||||
OPENSSL_LIB_DIR_aarch64_unknown_linux_gnu=/usr/lib/aarch64-linux-gnu \
|
||||
OPENSSL_INCLUDE_DIR_aarch64_unknown_linux_gnu=/usr/include/aarch64-linux-gnu \
|
||||
CC_x86_64_unknown_linux_gnu=x86_64-linux-gnu-gcc \
|
||||
CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER=x86_64-linux-gnu-gcc \
|
||||
PKG_CONFIG_LIBDIR_x86_64_unknown_linux_gnu=/usr/lib/x86_64-linux-gnu/pkgconfig \
|
||||
PKG_CONFIG_PATH_x86_64_unknown_linux_gnu=/usr/lib/x86_64-linux-gnu/pkgconfig \
|
||||
OPENSSL_DIR_x86_64_unknown_linux_gnu=/usr/lib/x86_64-linux-gnu \
|
||||
OPENSSL_LIB_DIR_x86_64_unknown_linux_gnu=/usr/lib/x86_64-linux-gnu \
|
||||
OPENSSL_INCLUDE_DIR_x86_64_unknown_linux_gnu=/usr/include/x86_64-linux-gnu
|
||||
# Install cross-compilation deps
|
||||
ARG BUILDPLATFORM
|
||||
RUN if [ "${TARGETARCH}" = "amd64" ]; then \
|
||||
echo "x86_64-linux-gnu" > /tmp/target_deb_arch; \
|
||||
elif [ "${TARGETARCH}" = "arm64" ]; then \
|
||||
echo "aarch64-linux-gnu" > /tmp/target_deb_arch; \
|
||||
else \
|
||||
echo "Unsupported TARGETARCH: ${TARGETARCH}" >&2; exit 1; \
|
||||
fi
|
||||
|
||||
RUN set -eux; \
|
||||
case "${TARGETARCH}" in \
|
||||
amd64) TARGET_DEB_ARCH=amd64 ;; \
|
||||
arm64) TARGET_DEB_ARCH=arm64 ;; \
|
||||
*) echo "Unsupported TARGETARCH: ${TARGETARCH}" >&2; exit 1 ;; \
|
||||
esac; \
|
||||
BUILD_DEB_ARCH="$(dpkg --print-architecture)"; \
|
||||
if [ "${TARGET_DEB_ARCH}" != "${BUILD_DEB_ARCH}" ]; then \
|
||||
dpkg --add-architecture "${TARGET_DEB_ARCH}"; \
|
||||
fi; \
|
||||
apt-get update; \
|
||||
apt-get install -y --no-install-recommends \
|
||||
build-essential \
|
||||
pkg-config \
|
||||
curl \
|
||||
libssl-dev \
|
||||
libpq-dev \
|
||||
libjpeg-dev \
|
||||
libpng-dev \
|
||||
zlib1g-dev; \
|
||||
if [ "${TARGET_DEB_ARCH}" != "${BUILD_DEB_ARCH}" ]; then \
|
||||
# Detect build arch (assuming debian-like names compatible with apt)
|
||||
dpkg_arch="$(dpkg --print-architecture)"; \
|
||||
target_deb_arch="$(cat /tmp/target_deb_arch)"; \
|
||||
\
|
||||
# If we are cross-compiling
|
||||
if [ "${dpkg_arch}" != "${TARGETARCH}" ]; then \
|
||||
# Map target arch to debian package arch suffix if needed, but usually apt handles :arch
|
||||
# For cross-compiling, we need to add the architecture
|
||||
dpkg --add-architecture "${TARGETARCH}"; \
|
||||
apt-get update; \
|
||||
\
|
||||
case "${TARGETARCH}" in \
|
||||
arm64) CROSS_GCC=gcc-aarch64-linux-gnu ;; \
|
||||
amd64) CROSS_GCC=gcc-x86-64-linux-gnu ;; \
|
||||
esac; \
|
||||
\
|
||||
apt-get install -y --no-install-recommends \
|
||||
"${CROSS_GCC}" \
|
||||
"libc6-dev:${TARGET_DEB_ARCH}" \
|
||||
"libssl-dev:${TARGET_DEB_ARCH}" \
|
||||
"libpq-dev:${TARGET_DEB_ARCH}" \
|
||||
"libjpeg-dev:${TARGET_DEB_ARCH}" \
|
||||
"libpng-dev:${TARGET_DEB_ARCH}" \
|
||||
"zlib1g-dev:${TARGET_DEB_ARCH}"; \
|
||||
"libc6-dev:${TARGETARCH}" \
|
||||
"libssl-dev:${TARGETARCH}" \
|
||||
"libpq-dev:${TARGETARCH}" \
|
||||
"libjpeg-dev:${TARGETARCH}" \
|
||||
"libpng-dev:${TARGETARCH}" \
|
||||
"zlib1g-dev:${TARGETARCH}"; \
|
||||
\
|
||||
# Configure PKG_CONFIG and LINKER to find foreign libraries
|
||||
case "${TARGETARCH}" in \
|
||||
"amd64") \
|
||||
GNU_ARCH="x86_64-linux-gnu" \
|
||||
RUST_ARCH="x86_64_unknown_linux_gnu" \
|
||||
RUST_ARCH_UPPER="X86_64_UNKNOWN_LINUX_GNU" \
|
||||
;; \
|
||||
"arm64") \
|
||||
GNU_ARCH="aarch64-linux-gnu" \
|
||||
RUST_ARCH="aarch64_unknown_linux_gnu" \
|
||||
RUST_ARCH_UPPER="AARCH64_UNKNOWN_LINUX_GNU" \
|
||||
;; \
|
||||
esac; \
|
||||
\
|
||||
{ \
|
||||
echo "export PKG_CONFIG_ALLOW_CROSS=1"; \
|
||||
echo "export PKG_CONFIG_PATH=/usr/lib/${GNU_ARCH}/pkgconfig"; \
|
||||
echo "export OPENSSL_DIR=/usr/lib/${GNU_ARCH}"; \
|
||||
echo "export OPENSSL_LIB_DIR=/usr/lib/${GNU_ARCH}"; \
|
||||
echo "export OPENSSL_INCLUDE_DIR=/usr/include/${GNU_ARCH}"; \
|
||||
echo "export CARGO_TARGET_${RUST_ARCH_UPPER}_LINKER=${GNU_ARCH}-gcc"; \
|
||||
echo "export CC_${RUST_ARCH}=${GNU_ARCH}-gcc"; \
|
||||
echo "export CXX_${RUST_ARCH}=${GNU_ARCH}-g++"; \
|
||||
} >> /etc/profile; \
|
||||
fi; \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
ENV PKG_CONFIG_ALLOW_CROSS=1
|
||||
|
||||
COPY Cargo.toml Cargo.lock build.rs ./
|
||||
COPY src ./src
|
||||
COPY migrations ./migrations
|
||||
@@ -85,6 +195,9 @@ COPY resources ./resources
|
||||
COPY diesel.toml ./
|
||||
|
||||
RUN set -eux; \
|
||||
echo "Loading cross-compilation environment..."; \
|
||||
. /etc/profile; \
|
||||
export PATH="$PATH:/usr/local/cargo/bin"; \
|
||||
TARGET="$(/usr/local/bin/resolve-target.sh "${TARGETARCH}")"; \
|
||||
rustup target add "${TARGET}"; \
|
||||
cargo build --release --target "${TARGET}" --bin backend --bin worker --bin webdav --bin admin; \
|
||||
@@ -93,37 +206,18 @@ RUN set -eux; \
|
||||
cp "target/${TARGET}/release/${bin}" "/artifacts/${bin}"; \
|
||||
done
|
||||
|
||||
RUN set -eux; \
|
||||
case "${TARGETARCH}" in \
|
||||
amd64) pdfium_package=pdfium-linux-x64.tgz ;; \
|
||||
arm64) pdfium_package=pdfium-linux-arm64.tgz ;; \
|
||||
*) echo "Unsupported TARGETARCH: ${TARGETARCH}" >&2; exit 1 ;; \
|
||||
esac; \
|
||||
curl -fsSL "https://github.com/bblanchon/pdfium-binaries/releases/latest/download/${pdfium_package}" -o /tmp/pdfium.tgz; \
|
||||
mkdir -p /tmp/pdfium; \
|
||||
tar -xzf /tmp/pdfium.tgz -C /tmp/pdfium --strip-components=1; \
|
||||
pdfium_so="$(find /tmp/pdfium -name libpdfium.so -type f | head -n1)"; \
|
||||
[ -n "${pdfium_so}" ]; \
|
||||
cp "${pdfium_so}" /artifacts/libpdfium.so; \
|
||||
rm -rf /tmp/pdfium.tgz /tmp/pdfium
|
||||
|
||||
FROM --platform=$TARGETPLATFORM debian:trixie-slim AS runtime
|
||||
# ------------------------------------------------------------------------------
|
||||
# Production Runtime Stage
|
||||
# ------------------------------------------------------------------------------
|
||||
FROM debian:trixie-slim AS runtime
|
||||
ARG TARGETARCH
|
||||
ARG RUNTIME_DEPS
|
||||
WORKDIR /app
|
||||
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y --no-install-recommends \
|
||||
ca-certificates \
|
||||
curl \
|
||||
libssl3 \
|
||||
libpq5 \
|
||||
libjpeg62-turbo \
|
||||
libpng16-16 \
|
||||
ocrmypdf \
|
||||
tesseract-ocr \
|
||||
ghostscript \
|
||||
qpdf \
|
||||
ffmpeg \
|
||||
ca-certificates curl libssl3 libpq5 libjpeg62-turbo libpng16-16 \
|
||||
${RUNTIME_DEPS} \
|
||||
&& rm -rf /var/lib/apt/lists/* \
|
||||
&& mkdir -p /usr/local/lib \
|
||||
&& useradd --system --create-home --uid 10001 appuser
|
||||
@@ -132,7 +226,8 @@ COPY --from=builder /artifacts/backend /usr/local/bin/papercrate-backend
|
||||
COPY --from=builder /artifacts/worker /usr/local/bin/papercrate-worker
|
||||
COPY --from=builder /artifacts/webdav /usr/local/bin/papercrate-webdav
|
||||
COPY --from=builder /artifacts/admin /usr/local/bin/papercrate-admin
|
||||
COPY --from=builder /artifacts/libpdfium.so /usr/local/lib/libpdfium.so
|
||||
COPY --from=base /usr/local/lib/libpdfium.so /usr/local/lib/libpdfium.so
|
||||
|
||||
RUN ldconfig
|
||||
COPY migrations ./migrations
|
||||
|
||||
|
||||
@@ -1,6 +1,2 @@
|
||||
[print_schema]
|
||||
file = "src/schema.rs"
|
||||
custom_type_derives = ["diesel::query_builder::QueryId", "Clone"]
|
||||
|
||||
[migrations_directory]
|
||||
dir = "migrations"
|
||||
Executable
+16
@@ -0,0 +1,16 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
echo "Waiting for Postgres..."
|
||||
until pg_isready -h postgres -U papercrate; do
|
||||
sleep 1
|
||||
done
|
||||
|
||||
echo "Running migrations..."
|
||||
diesel migration run
|
||||
|
||||
echo "Building binaries for first run..."
|
||||
cargo build --bin backend --bin worker --bin webdav
|
||||
|
||||
echo "Starting supervisord..."
|
||||
exec supervisord -c supervisord.conf
|
||||
@@ -0,0 +1,67 @@
|
||||
[supervisord]
|
||||
nodaemon=true
|
||||
user=root
|
||||
logfile=/dev/null
|
||||
logfile_maxbytes=0
|
||||
pidfile=/var/run/supervisord.pid
|
||||
|
||||
[unix_http_server]
|
||||
file=/var/run/supervisor.sock
|
||||
chmod=0700
|
||||
|
||||
[rpcinterface:supervisor]
|
||||
supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
|
||||
|
||||
[supervisorctl]
|
||||
serverurl=unix:///var/run/supervisor.sock
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# Applications
|
||||
# ------------------------------------------------------------------------------
|
||||
|
||||
[program:backend]
|
||||
command=/cargo-target/debug/backend
|
||||
directory=/app
|
||||
autostart=true
|
||||
autorestart=true
|
||||
stdout_logfile=/dev/stdout
|
||||
stdout_logfile_maxbytes=0
|
||||
stderr_logfile=/dev/stderr
|
||||
stderr_logfile_maxbytes=0
|
||||
|
||||
[program:worker]
|
||||
command=/cargo-target/debug/worker
|
||||
directory=/app
|
||||
autostart=true
|
||||
autorestart=true
|
||||
stdout_logfile=/dev/stdout
|
||||
stdout_logfile_maxbytes=0
|
||||
stderr_logfile=/dev/stderr
|
||||
stderr_logfile_maxbytes=0
|
||||
|
||||
[program:webdav]
|
||||
command=/cargo-target/debug/webdav
|
||||
directory=/app
|
||||
autostart=true
|
||||
autorestart=true
|
||||
stdout_logfile=/dev/stdout
|
||||
stdout_logfile_maxbytes=0
|
||||
stderr_logfile=/dev/stderr
|
||||
stderr_logfile_maxbytes=0
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# Watcher
|
||||
# ------------------------------------------------------------------------------
|
||||
|
||||
[program:watcher]
|
||||
# 1. Check syntax
|
||||
# 2. Build binaries
|
||||
# 3. Restart services via supervisorctl
|
||||
command=cargo watch -w src -x check -x "build --bin backend --bin worker --bin webdav" -s "supervisorctl restart backend worker webdav"
|
||||
directory=/app
|
||||
autostart=true
|
||||
autorestart=true
|
||||
stdout_logfile=/dev/stdout
|
||||
stdout_logfile_maxbytes=0
|
||||
stderr_logfile=/dev/stderr
|
||||
stderr_logfile_maxbytes=0
|
||||
Reference in New Issue
Block a user