Skip to content

Commit f126d72

Browse files
committed
[FIX] 11.0-13.0: use apt-get to install wkhtmltopdf
Usage of apt-get should prevent installing wkhtmltopdf on wrong architecture.
1 parent c1fbc53 commit f126d72

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

11.0/Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ RUN set -x; \
3131
xz-utils \
3232
&& curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \
3333
&& echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \
34-
&& dpkg --force-depends -i wkhtmltox.deb\
35-
&& apt-get -y install -f --no-install-recommends \
34+
&& apt-get install -y --no-install-recommends ./wkhtmltox.deb \
3635
&& rm -rf /var/lib/apt/lists/* wkhtmltox.deb
3736

3837
# install latest postgresql-client

12.0/Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ RUN set -x; \
3131
xz-utils \
3232
&& curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \
3333
&& echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \
34-
&& dpkg --force-depends -i wkhtmltox.deb\
35-
&& apt-get -y install -f --no-install-recommends \
34+
&& apt-get install -y --no-install-recommends ./wkhtmltox.deb \
3635
&& rm -rf /var/lib/apt/lists/* wkhtmltox.deb
3736

3837
# install latest postgresql-client

13.0/Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ RUN set -x; \
2929
xz-utils \
3030
&& curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \
3131
&& echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \
32-
&& dpkg --force-depends -i wkhtmltox.deb\
33-
&& apt-get -y install -f --no-install-recommends \
32+
&& apt-get install -y --no-install-recommends ./wkhtmltox.deb \
3433
&& rm -rf /var/lib/apt/lists/* wkhtmltox.deb
3534

3635
# install latest postgresql-client

0 commit comments

Comments
 (0)