From 44f391026632a53608c3728702f999fec4809a20 Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Sun, 7 Jan 2024 15:57:21 +0200 Subject: [PATCH] fix build --- .gitignore | 1 - .version | 0 Dockerfile | 4 ++-- 3 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 .version diff --git a/.gitignore b/.gitignore index c266ed37a..dd1db6a54 100644 --- a/.gitignore +++ b/.gitignore @@ -31,7 +31,6 @@ yarn-debug.log* .env .DS_Store -.version /coverage /attachments diff --git a/.version b/.version new file mode 100644 index 000000000..e69de29bb diff --git a/Dockerfile b/Dockerfile index da52ec4f0..37d707e2e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ruby:3.2.2-alpine3.18 as fonts WORKDIR /fonts -RUN apk --no-cache add fontforge wget ttf-liberation && cp /usr/share/fonts/liberation/LiberationSans-Regular.ttf /usr/share/fonts/liberation/LiberationSans-Bold.ttf . && wget https://cdn.jsdelivr.net/gh/notofonts/notofonts.github.io/fonts/NotoSansArabic/hinted/ttf/NotoSansArabic-Regular.ttf && wget https://github.com/impallari/DancingScript/raw/master/fonts/DancingScript-Regular.otf && wget https://github.com/impallari/DancingScript/blob/master/OFL.txt +RUN apk --no-cache add fontforge wget ttf-liberation && cp /usr/share/fonts/liberation/LiberationSans-Regular.ttf /usr/share/fonts/liberation/LiberationSans-Bold.ttf . && wget https://cdn.jsdelivr.net/gh/notofonts/notofonts.github.io/fonts/NotoSansArabic/hinted/ttf/NotoSansArabic-Regular.ttf && wget https://github.com/impallari/DancingScript/raw/master/fonts/DancingScript-Regular.otf && wget https://github.com/impallari/DancingScript/raw/master/OFL.txt RUN fontforge -lang=py -c 'font1 = fontforge.open("LiberationSans-Regular.ttf"); font2 = fontforge.open("NotoSansArabic-Regular.ttf"); font1.mergeFonts(font2); font1.generate("LiberationSans-Regular.ttf")' @@ -39,7 +39,7 @@ ENV BUNDLE_WITHOUT="development:test" WORKDIR /app -RUN apk add --no-cache build-base sqlite-dev libpq-dev mariadb-dev vips-dev vips-poppler poppler-utils vips-heif libc6-compat ttf-freefont && mkdir /fonts && touch .version +RUN apk add --no-cache build-base sqlite-dev libpq-dev mariadb-dev vips-dev vips-poppler poppler-utils vips-heif libc6-compat ttf-freefont && mkdir /fonts COPY ./Gemfile ./Gemfile.lock ./