Skip to content

Commit be52b92

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 a8bbb7c commit be52b92

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

11.0/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ RUN set -x; \
2525
xz-utils \
2626
&& curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \
2727
&& echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \
28-
&& dpkg --force-depends -i wkhtmltox.deb\
29-
&& apt-get -y install -f --no-install-recommends \
28+
&& apt-get install -y --no-install-recommends ./wkhtmltox.deb \
3029
&& rm -rf /var/lib/apt/lists/* wkhtmltox.deb
3130

3231
# install latest postgresql-client

12.0/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ RUN set -x; \
2525
xz-utils \
2626
&& curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \
2727
&& echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \
28-
&& dpkg --force-depends -i wkhtmltox.deb\
29-
&& apt-get -y install -f --no-install-recommends \
28+
&& apt-get install -y --no-install-recommends ./wkhtmltox.deb \
3029
&& rm -rf /var/lib/apt/lists/* wkhtmltox.deb
3130

3231
# install latest postgresql-client

13.0/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ RUN set -x; \
2626
xz-utils \
2727
&& curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \
2828
&& echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \
29-
&& dpkg --force-depends -i wkhtmltox.deb\
30-
&& apt-get -y install -f --no-install-recommends \
29+
&& apt-get install -y --no-install-recommends ./wkhtmltox.deb \
3130
&& rm -rf /var/lib/apt/lists/* wkhtmltox.deb
3231

3332
# install latest postgresql-client

0 commit comments

Comments
 (0)