From 2ee2e8b8e35cafc9ab4611e65e961f1317affd02 Mon Sep 17 00:00:00 2001 From: Sequencer <45060278+sequencerr@users.noreply.github.com> Date: Sun, 19 Jan 2025 13:27:03 +0100 Subject: [PATCH 1/3] Add docker --- .gitignore | 1 + Dockerfile | 28 ++++++++++++++++++++++++++++ docker-compose.yml | 22 ++++++++++++++++++++++ 3 files changed, 51 insertions(+) create mode 100644 Dockerfile create mode 100644 docker-compose.yml diff --git a/.gitignore b/.gitignore index 7f113fd..976a967 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +/.vscode /target res/fonthelper fonthelper.tar.xz diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..ef6aa46 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,28 @@ +FROM debian:12.8-slim AS binary +WORKDIR /app +RUN apt-get update && apt-get install -y --no-install-recommends \ + wget \ + ca-certificates \ + xz-utils && \ + echo "progress = bar:force:noscroll" > ~/.wgetrc && \ + wget --show-progress -qO- "http://github.com/Figma-Linux/figma-linux-font-helper/releases/download/v0.1.8/fonthelper.tar.xz" \ + | tar xJf - ./fonthelper && \ + chmod +x /app/fonthelper + +FROM debian:12.8-slim +COPY --from=binary /app/fonthelper /fonthelper +RUN useradd user && \ + install -vpdo user /home/user/.config/figma-linux /home/user/.cache/figma-fonthelper && \ + tee < Date: Sun, 19 Jan 2025 14:27:46 +0100 Subject: [PATCH 2/3] Add docker build from source. --- Dockerfile | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index ef6aa46..4d0328f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,18 @@ -FROM debian:12.8-slim AS binary -WORKDIR /app +FROM debian:12.8-slim AS source RUN apt-get update && apt-get install -y --no-install-recommends \ wget \ - ca-certificates \ - xz-utils && \ + ca-certificates && \ echo "progress = bar:force:noscroll" > ~/.wgetrc && \ - wget --show-progress -qO- "http://github.com/Figma-Linux/figma-linux-font-helper/releases/download/v0.1.8/fonthelper.tar.xz" \ - | tar xJf - ./fonthelper && \ - chmod +x /app/fonthelper + wget --show-progress -qO- "https://github.com/Figma-Linux/figma-linux-font-helper/archive/refs/tags/v0.1.8.tar.gz" \ + | tar xzf - --transform='s|^[^/]*/|figma-fonthelper/|' + +FROM rust:1.84-slim-bookworm AS binary +WORKDIR /app +COPY --from=source /figma-fonthelper . +RUN cargo build --release FROM debian:12.8-slim -COPY --from=binary /app/fonthelper /fonthelper +COPY --from=binary /app/target/release/font_helper /fonthelper RUN useradd user && \ install -vpdo user /home/user/.config/figma-linux /home/user/.cache/figma-fonthelper && \ tee < Date: Sun, 19 Jan 2025 14:38:42 +0100 Subject: [PATCH 3/3] Don't show progress --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4d0328f..c341592 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,8 +2,7 @@ FROM debian:12.8-slim AS source RUN apt-get update && apt-get install -y --no-install-recommends \ wget \ ca-certificates && \ - echo "progress = bar:force:noscroll" > ~/.wgetrc && \ - wget --show-progress -qO- "https://github.com/Figma-Linux/figma-linux-font-helper/archive/refs/tags/v0.1.8.tar.gz" \ + wget "https://github.com/Figma-Linux/figma-linux-font-helper/archive/refs/tags/v0.1.8.tar.gz" -qO- \ | tar xzf - --transform='s|^[^/]*/|figma-fonthelper/|' FROM rust:1.84-slim-bookworm AS binary