Merge pull request 'beta' (#15 ) from beta into master

Reviewed-on: crm/crm-print#15
Merge pull request '修改 Dockerfile_prod' (#14 ) from dev into beta
2024-08-01 18:05:33 +08:00 · 2024-08-01 18:05:03 +08:00 · 2024-05-30 17:27:15 +08:00 · 2024-05-30 14:05:21 +08:00 · 2024-05-28 14:30:41 +08:00 · 2024-05-28 14:00:29 +08:00
1 changed files with 1 additions and 2 deletions
--- a/3
+++ b/3
@ -11,7 +11,6 @@ RUN set -eux && sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk
    apk add fontconfig &&\
    apk --update add unzip &&\
    mkdir -p /usr/share/fonts/chinese &&\
    mkdir -p /usr/share/fonts/korean &&\
    cd /tmp &&\
    wget http://kkfileview.keking.cn/fonts.zip &&\
    unzip -d  /usr/share/fonts/chinese fonts.zip  &&\
@ -20,7 +19,7 @@ RUN set -eux && sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk
    mkfontdir &&\
    fc-cache -fv &&\
    rm -rf /var/cache/*
-COPY ./fonts/* /usr/share/fonts/korean/
+
 COPY ./server/target/crm-print-server-1.0.0.jar /
 WORKDIR /
 EXPOSE 9089
Author	SHA1	Message	Date
luobai	cc44f8f5c2	Merge pull request 'beta' (#15 ) from beta into master Reviewed-on: crm/crm-print#15	2024-08-01 18:05:33 +08:00
luobai	170e449f4e	Merge pull request '修改 Dockerfile_prod' (#14 ) from dev into beta Reviewed-on: crm/crm-print#14	2024-08-01 18:05:03 +08:00
luobai	5f0b373d3b	Merge pull request 'beta' (#13 ) from beta into master Reviewed-on: crm/crm-print#13	2024-05-30 17:27:15 +08:00
luobai	e1d0aee060	Merge pull request '打印支持俄文' (#12 ) from dev into beta Reviewed-on: crm/crm-print#12	2024-05-30 14:05:21 +08:00
luobai	5cc7545233	Merge pull request '修改 Dockerfile_gray' (#11 ) from dev into beta Reviewed-on: crm/crm-print#11	2024-05-28 14:30:41 +08:00
luobai	8122a51f29	Merge pull request '打印支持韩文' (#10 ) from dev into beta Reviewed-on: crm/crm-print#10	2024-05-28 14:00:29 +08:00
luobai	2b3a041a29	Merge pull request '打印支持韩文' (#9 ) from dev into beta Reviewed-on: crm/crm-print#9	2024-05-28 11:23:45 +08:00
luobai	4a3d56407c	Merge pull request 'beta' (#8 ) from beta into master Reviewed-on: crm/crm-print#8	2024-01-12 17:38:55 +08:00
luobai	b995656323	Merge pull request 'beta' (#4 ) from beta into master Reviewed-on: crm/crm-print#4	2023-12-24 16:20:40 +08:00