javier
9774454bba
This PR contains the work done to get the Website service building and running correctly in its Linux container. The service depends on the local _Localization_ package, whose String-Catalog localization was Darwin-only and broke the Docker build. Thus the localization internals have been reworked to be platform-agnostic and fixes the container build context so the local package is actually available during the build. * Localization package * Replaced the Darwin-only `String.LocalizationValue` / `String(localized:)` path with a StringCatalog type that reads raw JSON from a given `.xcstrings` file, so lookups resolve identically on macOS and Linux. * The `LanguageList` now derives available languages from the catalog instead of `Bundle.localizations` * The `Negotiate` does explicit _Accept-Language_ matching (exact tag, then primary subtag) instead of the Linux-broken `Bundle.preferredLocalizations`. * Switched the catalog resource rule from `.process` to `.copy` (in both Localization and Website manifests) so the raw `.xcstrings` ships verbatim on every platform. * Introduced a `CatalogResolving` protocol as a seam between the localizers and the storage backend, enabling test injection and a future native-Apple backend without changing callers. * Website Docker build * Build context moved to the repository root so the relative-path `Localization` package is inside the context; `Dockerfile`, `docker-compose.override.yml`, and the _img-release_ make target updated to the new context/paths. * Added a root `.dockerignore` to keep the context lean. Reviewed-on: rock-n-code/loud-amsterdam#12 Co-authored-by: Javier Cicchelli <javier@rock-n-code.com> Co-committed-by: Javier Cicchelli <javier@rock-n-code.com>
89 lines
3.4 KiB
Docker
89 lines
3.4 KiB
Docker
# ================================
|
|
# Build image
|
|
# ================================
|
|
FROM swift:6.3-noble AS build
|
|
|
|
# Install OS updates
|
|
RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \
|
|
&& apt-get -q update \
|
|
&& apt-get -q dist-upgrade -y \
|
|
&& apt-get install -y libjemalloc-dev \
|
|
&& rm -rf /var/lib/apt/lists/*
|
|
|
|
# Set up a build area
|
|
WORKDIR /build
|
|
|
|
# First just resolve dependencies.
|
|
# This creates a cached layer that can be reused as long as the manifests do
|
|
# not change. The Website package depends on the local Localization package via
|
|
# a relative path, so its manifest must be present for resolution to succeed.
|
|
COPY ./Packages/Localization/Package.swift ./Packages/Localization/
|
|
COPY ./Services/Website/Package.swift ./Services/Website/Package.resolved ./Services/Website/
|
|
RUN swift package --package-path ./Services/Website resolve
|
|
|
|
# Copy entire repo into container
|
|
COPY . .
|
|
|
|
# Build the application, with optimizations, with static linking, and using jemalloc
|
|
RUN swift build --package-path ./Services/Website -c release \
|
|
--product "Website" \
|
|
--static-swift-stdlib \
|
|
-Xlinker -ljemalloc
|
|
|
|
# Switch to the staging area
|
|
WORKDIR /staging
|
|
|
|
# Copy main executable to staging area
|
|
RUN cp "$(swift build --package-path /build/Services/Website -c release --show-bin-path)/Website" ./
|
|
|
|
# Copy static swift backtracer binary to staging area
|
|
RUN cp "/usr/libexec/swift/linux/swift-backtrace-static" ./
|
|
|
|
# Copy resources bundled by SPM to staging area
|
|
RUN find -L "$(swift build --package-path /build/Services/Website -c release --show-bin-path)/" -regex '.*\.resources$' -exec cp -Ra {} ./ \;
|
|
|
|
# Copy the static files directory (served by FileMiddleware) if it exists
|
|
# Ensure that by default, neither the directory nor any of its contents are writable.
|
|
RUN [ -d /build/Services/Website/Resources ] && { mv /build/Services/Website/Resources ./Resources && chmod -R a-w ./Resources; } || true
|
|
|
|
# ================================
|
|
# Run image
|
|
# ================================
|
|
FROM ubuntu:noble
|
|
|
|
# Make sure all system packages are up to date, and install only essential packages.
|
|
RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true \
|
|
&& apt-get -q update \
|
|
&& apt-get -q dist-upgrade -y \
|
|
&& apt-get -q install -y \
|
|
libjemalloc2 \
|
|
ca-certificates \
|
|
tzdata \
|
|
# If your app or its dependencies import FoundationNetworking, also install `libcurl4`.
|
|
# libcurl4 \
|
|
# If your app or its dependencies import FoundationXML, also install `libxml2`.
|
|
# libxml2 \
|
|
&& rm -r /var/lib/apt/lists/*
|
|
|
|
# Create a hummingbird user and group with /app as its home directory
|
|
RUN useradd --user-group --create-home --system --skel /dev/null --home-dir /app hummingbird
|
|
|
|
# Switch to the new home directory
|
|
WORKDIR /app
|
|
|
|
# Copy built executable and any staged resources from builder
|
|
COPY --from=build --chown=hummingbird:hummingbird /staging /app
|
|
|
|
# Provide configuration needed by the built-in crash reporter and some sensible default behaviors.
|
|
ENV SWIFT_BACKTRACE=enable=yes,sanitize=yes,threads=all,images=all,interactive=no,swift-backtrace=./swift-backtrace-static
|
|
|
|
# Ensure all further commands run as the hummingbird user
|
|
USER hummingbird:hummingbird
|
|
|
|
# Let Docker bind to port 8080
|
|
EXPOSE 8080
|
|
|
|
# Start the Hummingbird service when the image is run, default to listening on 8080 in production environment
|
|
ENTRYPOINT ["./Website"]
|
|
CMD ["--http-host", "0.0.0.0", "--http-port", "8080"]
|