Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

editoast: fix glyph generation on docker on mac-arm #10848

Merged
merged 1 commit into from
Feb 19, 2025
Merged

editoast: fix glyph generation on docker on mac-arm #10848

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions editoast/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,16 @@ FROM chef AS base_builder
RUN apk add --no-cache build-base openssl openssl-dev openssl-libs-static mold libpq-dev geos-dev
ENV RUSTFLAGS="-C target-feature=-crt-static -C link-arg=-fuse-ld=mold"
RUN cargo install diesel_cli --no-default-features --features postgres
COPY --from=static_assets . /assets
COPY --from=static_assets . /assets

#######################
# Build assets #
#######################
FROM ubuntu:latest AS editoast_assets
RUN apt update && apt install --yes wget
RUN wget https://github.com/flother/spreet/releases/download/v0.11.0/spreet-x86_64-unknown-linux-musl.tar.gz
RUN tar xvf spreet-x86_64-unknown-linux-musl.tar.gz --directory /usr/bin
RUN wget http://github.com/stadiamaps/sdf_font_tools/releases/download/cli-v1.4.2/build_pbf_glyphs.x86_64-unknown-linux-gnu -O /usr/bin/build_pbf_glyphs
RUN chmod +x /usr/bin/build_pbf_glyphs
FROM chef AS editoast_assets
# build_pbf_glyphs requires a c++ compiler
RUN apk --no-cache add build-base
RUN cargo install spreet
RUN cargo install build_pbf_glyphs
COPY ./assets /assets
RUN /assets/sprites/generate-atlas.sh
RUN /assets/fonts/generate-glyphs.sh
Expand Down
Loading