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

Reviewed-on: crm/crm-print#15
This commit is contained in:
luobai 2024-08-01 18:05:33 +08:00
commit cc44f8f5c2

View File

@ -11,6 +11,7 @@ RUN set -eux && sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk
apk add fontconfig &&\ apk add fontconfig &&\
apk --update add unzip &&\ apk --update add unzip &&\
mkdir -p /usr/share/fonts/chinese &&\ mkdir -p /usr/share/fonts/chinese &&\
mkdir -p /usr/share/fonts/korean &&\
cd /tmp &&\ cd /tmp &&\
wget http://kkfileview.keking.cn/fonts.zip &&\ wget http://kkfileview.keking.cn/fonts.zip &&\
unzip -d /usr/share/fonts/chinese fonts.zip &&\ unzip -d /usr/share/fonts/chinese fonts.zip &&\
@ -20,6 +21,7 @@ RUN set -eux && sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk
fc-cache -fv &&\ fc-cache -fv &&\
rm -rf /var/cache/* rm -rf /var/cache/*
COPY ./fonts/* /usr/share/fonts/korean/
COPY ./server/target/crm-print-server-1.0.0.jar / COPY ./server/target/crm-print-server-1.0.0.jar /
WORKDIR / WORKDIR /
HEALTHCHECK --interval=60s --timeout=3s CMD curl -fs http://localhost:8080/crm-print/actuator/health || exit 1 HEALTHCHECK --interval=60s --timeout=3s CMD curl -fs http://localhost:8080/crm-print/actuator/health || exit 1