Skip to content

Commit fb11f31

Browse files
authored
Fix Dockerfile (#9061)
- remove all version numbers from fonts/fontconfig - use font-noto-cjk instead of wqy-zenhei
1 parent bb923f3 commit fb11f31

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

Dockerfile

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,14 @@ FROM base
3838
# these libs are necessary for operation
3939
RUN apk --no-cache add libmagic cairo pango ttf-opensans && \
4040
apk --no-cache add postgresql-libs libxslt jpeg zlib libxml2 # those *might* be useful
41-
RUN apk --no-cache add fontconfig=2.14.2-r3 font-noto-gujarati=23.5.1-r0 font-noto-kannada=23.5.1-r0 && \
42-
apk --no-cache add font-noto-osage=23.5.1-r0 font-noto-kayahli=23.5.1-r0 font-noto-oriya=23.5.1-r0 && \
43-
apk --no-cache add font-noto-telugu=23.5.1-r0 font-noto-tamil=23.5.1-r0 font-noto-bengali=23.5.1-r0 && \
44-
apk --no-cache add font-noto-malayalam=23.5.1-r0 font-noto-arabic=23.5.1-r0 font-noto-extra=23.5.1-r0 && \
45-
apk --no-cache add font-noto-armenian=23.5.1-r0 font-noto-cherokee=23.5.1-r0 font-noto-devanagari=23.5.1-r0 && \
46-
apk --no-cache add font-noto-ethiopic=23.5.1-r0 font-noto-georgian=23.5.1-r0 font-noto-hebrew=23.5.1-r0 && \
47-
apk --no-cache add font-noto-lao=23.5.1-r0 font-noto-thaana=23.5.1-r0 font-noto-thai=23.5.1-r0 && \
48-
echo @edge http://nl.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \
49-
apk --no-cache add wqy-zenhei@edge=0.9.45-r2
41+
# Various fonts for proper name printing
42+
RUN apk --no-cache add fontconfig font-noto-gujarati font-noto-kannada && \
43+
apk --no-cache add font-noto-osage font-noto-kayahli font-noto-oriya && \
44+
apk --no-cache add font-noto-telugu font-noto-tamil font-noto-bengali && \
45+
apk --no-cache add font-noto-malayalam font-noto-arabic font-noto-extra && \
46+
apk --no-cache add font-noto-armenian font-noto-cherokee font-noto-devanagari && \
47+
apk --no-cache add font-noto-ethiopic font-noto-georgian font-noto-hebrew && \
48+
apk --no-cache add font-noto-lao font-noto-thaana font-noto-thai font-noto-cjk
5049
RUN fc-cache -f
5150

5251
COPY --from=builder /opt/pysetup/.venv /opt/pysetup/.venv

0 commit comments

Comments
 (0)