Merge branch 'main' into next

This commit is contained in:
nocobase[bot] 2025-01-11 16:44:37 +00:00
commit 52407eb3af

View File

@ -70,9 +70,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
libfreetype6 \ libfreetype6 \
fontconfig \ fontconfig \
libgssapi-krb5-2 \ libgssapi-krb5-2 \
ttf-mscorefonts-installer \ fonts-liberation \
fonts-wqy-zenhei && \ fonts-noto-cjk \
rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN rm -rf /etc/nginx/sites-enabled/default RUN rm -rf /etc/nginx/sites-enabled/default
COPY ./docker/nocobase/nocobase.conf /etc/nginx/sites-enabled/nocobase.conf COPY ./docker/nocobase/nocobase.conf /etc/nginx/sites-enabled/nocobase.conf