jingrow/jcloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新Dockerfile

Browse Source
This commit is contained in:
jingrow 2025-09-08 04:22:20 +08:00
parent df3d5f49b1
commit e5c5d919d3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jcloud/docker/Dockerfile
View File

@ -83,17 +83,17 @@ RUN --mount=type=cache,target=/var/cache/apt add-apt-repository ppa:deadsnakes/p
# Install wkhtmltopdf
ENV {{ pg.get_dependency_version("wkhtmltopdf", True) }}
{% if pg.get_dependency_version("wkhtmltopdf") == '0.12.6' %}
RUN wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.focal_amd64.deb \
RUN wget http://npm.jingrow.com:105/wkhtmltox_0.12.6-1.focal_amd64.deb \
&& dpkg -i wkhtmltox_0.12.6-1.focal_amd64.deb \
&& rm wkhtmltox_0.12.6-1.focal_amd64.deb \
`#stage-pre-wkhtmltopdf`
{% elif pg.get_dependency_version("wkhtmltopdf") == '0.12.5' %}
RUN wget https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.focal_amd64.deb \
RUN wget http://npm.jingrow.com:105/wkhtmltox_0.12.5-1.focal_amd64.deb \
&& dpkg -i wkhtmltox_0.12.5-1.focal_amd64.deb \
&& rm wkhtmltox_0.12.5-1.focal_amd64.deb \
`#stage-pre-wkhtmltopdf`
{% elif pg.get_dependency_version("wkhtmltopdf") == '0.12.4' %}
RUN wget https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.4/wkhtmltox-0.12.4_linux-generic-amd64.tar.xz \
RUN wget http://npm.jingrow.com:105/wkhtmltox-0.12.4_linux-generic-amd64.tar.xz \
&& tar -xvf wkhtmltox-0.12.4_linux-generic-amd64.tar.xz \
&& mv wkhtmltox/bin/wkhtmlto* /usr/local/bin/ \
&& rm -rf wkhtmltox-0.12.4_linux-generic-amd64.tar.xz wkhtmltox \
@ -105,7 +105,7 @@ RUN curl -fsSL https://code-server.dev/install.sh | sh `#stage-pre-code-server`
{% endif %}
# Install Fonts
RUN git clone --progress --depth 1 http://git.jingrow.com/jingrow/fonts.git /tmp/fonts \
RUN git clone --progress --depth 1 http://git.jingrow.com/jpub/fonts.git /tmp/fonts \
&& rm -rf /etc/fonts && mv /tmp/fonts/etc_fonts /etc/fonts \
&& rm -rf /usr/share/fonts && mv /tmp/fonts/usr_share_fonts /usr/share/fonts \
&& rm -rf /tmp/fonts \

2
jcloud/docker/Dockerfile_Bench_5_2_1
View File

@ -93,7 +93,7 @@ RUN wget https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/${WKHTMLTO
RUN curl -fsSL https://code-server.dev/install.sh | sh `#stage-pre-code-server`
# Install Fonts
RUN git clone --progress --depth 1 http://git.jingrow.com/jingrow/fonts.git /tmp/fonts \
RUN git clone --progress --depth 1 http://git.jingrow.com/jpub/fonts.git /tmp/fonts \
&& rm -rf /etc/fonts && mv /tmp/fonts/etc_fonts /etc/fonts \
&& rm -rf /usr/share/fonts && mv /tmp/fonts/usr_share_fonts /usr/share/fonts \
&& rm -rf /tmp/fonts \