Fix wkhtmltodf and wp-cli installation

2025-12-10 11:01:14 +00:00 · 2022-12-14 11:35:06 +01:00
parent a1f7c0ccdd
commit d4b1fb1e9e
15 changed files with 52 additions and 24 deletions
--- a/.ansible/group_vars/all/work.yml
+++ b/.ansible/group_vars/all/work.yml
@@ -623,8 +623,8 @@ tools_available:
      command: |
        DEB_HOST_ARCH="$( dpkg-architecture --query DEB_HOST_ARCH )" \
        && WK_URL="$( \
-          curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/packaging/releases \
-          | awk -F\" "/wkhtmltopdf.*.${OS_RELEASE}_${DEB_HOST_ARCH}\.deb/{print \$(NF-1)}" \
+          curl -sS -L --fail 'https://wkhtmltopdf.org/downloads.html' \
+          | awk -F'"' "/wkhtmltopdf.*${OS_RELEASE}_${DEB_HOST_ARCH}\.deb/{print \$(NF-1)}" \
          | head -1 \
        )" \
        && echo "URL: ${WK_URL}" \
@@ -677,7 +677,9 @@ tools_available:
      type: custom
      command: curl -sS -L --fail "${WPCLI_URL}" -L -o /usr/local/bin/wp
      build_dep: []
-      run_dep: []
+      # Fixes: sh: 1: less: not found during 'wp help'
+      # It internally pipes it to less.
+      run_dep: [less]
      pre: WPCLI_URL="https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar"
      post: chmod +x /usr/local/bin/wp
    5.5:
--- a/Dockerfiles/work/Dockerfile-5.3
+++ b/Dockerfiles/work/Dockerfile-5.3
@@ -270,6 +270,7 @@ RUN set -eux \
 		# ---------- run_deps ----------
 		dos2unix \
 		file \
+		less \
 		moreutils \
 		ruby \
 		# ---------- type: apt ----------
@@ -581,6 +582,7 @@ RUN set -eux \
 		# ---------- run_deps ----------
 		dos2unix \
 		file \
+		less \
 		moreutils \
 		ruby \
 		# ---------- type: apt ----------
--- a/Dockerfiles/work/Dockerfile-5.4
+++ b/Dockerfiles/work/Dockerfile-5.4
@@ -270,6 +270,7 @@ RUN set -eux \
 		# ---------- run_deps ----------
 		dos2unix \
 		file \
+		less \
 		moreutils \
 		ruby \
 		# ---------- type: apt ----------
@@ -604,6 +605,7 @@ RUN set -eux \
 		# ---------- run_deps ----------
 		dos2unix \
 		file \
+		less \
 		moreutils \
 		ruby \
 		# ---------- type: apt ----------
--- a/Dockerfiles/work/Dockerfile-5.5
+++ b/Dockerfiles/work/Dockerfile-5.5
@@ -270,6 +270,7 @@ RUN set -eux \
 		# ---------- run_deps ----------
 		dos2unix \
 		file \
+		less \
 		moreutils \
 		ruby \
 		# ---------- type: apt ----------
@@ -659,6 +660,7 @@ RUN set -eux \
 		# ---------- run_deps ----------
 		dos2unix \
 		file \
+		less \
 		moreutils \
 		ruby \
 		# ---------- type: apt ----------
--- a/Dockerfiles/work/Dockerfile-5.6
+++ b/Dockerfiles/work/Dockerfile-5.6
@@ -271,6 +271,7 @@ RUN set -eux \
 		dos2unix \
 		file \
 		fontconfig \
+		less \
 		libfontenc1 \
 		libxfont1 \
 		libxrender1 \
@@ -615,8 +616,8 @@ RUN set -eux \
 	&& OS_RELEASE="stretch"	\
 	&& DEB_HOST_ARCH="$( dpkg-architecture --query DEB_HOST_ARCH )" \
 	&& WK_URL="$( \
-	  curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/packaging/releases \
-	  | awk -F\" "/wkhtmltopdf.*.${OS_RELEASE}_${DEB_HOST_ARCH}\.deb/{print \$(NF-1)}" \
+	  curl -sS -L --fail 'https://wkhtmltopdf.org/downloads.html' \
+	  | awk -F'"' "/wkhtmltopdf.*${OS_RELEASE}_${DEB_HOST_ARCH}\.deb/{print \$(NF-1)}" \
 	  | head -1 \
 	)" \
 	&& echo "URL: ${WK_URL}" \
@@ -685,6 +686,7 @@ RUN set -eux \
 		dos2unix \
 		file \
 		fontconfig \
+		less \
 		libfontenc1 \
 		libxfont1 \
 		libxrender1 \
--- a/Dockerfiles/work/Dockerfile-7.0
+++ b/Dockerfiles/work/Dockerfile-7.0
@@ -271,6 +271,7 @@ RUN set -eux \
 		dos2unix \
 		file \
 		fontconfig \
+		less \
 		libfontenc1 \
 		libxfont1 \
 		libxrender1 \
@@ -615,8 +616,8 @@ RUN set -eux \
 	&& OS_RELEASE="stretch"	\
 	&& DEB_HOST_ARCH="$( dpkg-architecture --query DEB_HOST_ARCH )" \
 	&& WK_URL="$( \
-	  curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/packaging/releases \
-	  | awk -F\" "/wkhtmltopdf.*.${OS_RELEASE}_${DEB_HOST_ARCH}\.deb/{print \$(NF-1)}" \
+	  curl -sS -L --fail 'https://wkhtmltopdf.org/downloads.html' \
+	  | awk -F'"' "/wkhtmltopdf.*${OS_RELEASE}_${DEB_HOST_ARCH}\.deb/{print \$(NF-1)}" \
 	  | head -1 \
 	)" \
 	&& echo "URL: ${WK_URL}" \
@@ -685,6 +686,7 @@ RUN set -eux \
 		dos2unix \
 		file \
 		fontconfig \
+		less \
 		libfontenc1 \
 		libxfont1 \
 		libxrender1 \
--- a/Dockerfiles/work/Dockerfile-7.1
+++ b/Dockerfiles/work/Dockerfile-7.1
@@ -271,6 +271,7 @@ RUN set -eux \
 		dos2unix \
 		file \
 		fontconfig \
+		less \
 		libfontenc1 \
 		libxfont2 \
 		libxrender1 \
@@ -615,8 +616,8 @@ RUN set -eux \
 	&& OS_RELEASE="buster"	\
 	&& DEB_HOST_ARCH="$( dpkg-architecture --query DEB_HOST_ARCH )" \
 	&& WK_URL="$( \
-	  curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/packaging/releases \
-	  | awk -F\" "/wkhtmltopdf.*.${OS_RELEASE}_${DEB_HOST_ARCH}\.deb/{print \$(NF-1)}" \
+	  curl -sS -L --fail 'https://wkhtmltopdf.org/downloads.html' \
+	  | awk -F'"' "/wkhtmltopdf.*${OS_RELEASE}_${DEB_HOST_ARCH}\.deb/{print \$(NF-1)}" \
 	  | head -1 \
 	)" \
 	&& echo "URL: ${WK_URL}" \
@@ -685,6 +686,7 @@ RUN set -eux \
 		dos2unix \
 		file \
 		fontconfig \
+		less \
 		libfontenc1 \
 		libxfont2 \
 		libxrender1 \
--- a/Dockerfiles/work/Dockerfile-7.2
+++ b/Dockerfiles/work/Dockerfile-7.2
@@ -271,6 +271,7 @@ RUN set -eux \
 		dos2unix \
 		file \
 		fontconfig \
+		less \
 		libfontenc1 \
 		libxfont2 \
 		libxrender1 \
@@ -615,8 +616,8 @@ RUN set -eux \
 	&& OS_RELEASE="buster"	\
 	&& DEB_HOST_ARCH="$( dpkg-architecture --query DEB_HOST_ARCH )" \
 	&& WK_URL="$( \
-	  curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/packaging/releases \
-	  | awk -F\" "/wkhtmltopdf.*.${OS_RELEASE}_${DEB_HOST_ARCH}\.deb/{print \$(NF-1)}" \
+	  curl -sS -L --fail 'https://wkhtmltopdf.org/downloads.html' \
+	  | awk -F'"' "/wkhtmltopdf.*${OS_RELEASE}_${DEB_HOST_ARCH}\.deb/{print \$(NF-1)}" \
 	  | head -1 \
 	)" \
 	&& echo "URL: ${WK_URL}" \
@@ -685,6 +686,7 @@ RUN set -eux \
 		dos2unix \
 		file \
 		fontconfig \
+		less \
 		libfontenc1 \
 		libxfont2 \
 		libxrender1 \
--- a/Dockerfiles/work/Dockerfile-7.3
+++ b/Dockerfiles/work/Dockerfile-7.3
@@ -273,6 +273,7 @@ RUN set -eux \
 		dos2unix \
 		file \
 		fontconfig \
+		less \
 		libfontenc1 \
 		libxfont2 \
 		libxrender1 \
@@ -615,8 +616,8 @@ RUN set -eux \
 	&& OS_RELEASE="bullseye"	\
 	&& DEB_HOST_ARCH="$( dpkg-architecture --query DEB_HOST_ARCH )" \
 	&& WK_URL="$( \
-	  curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/packaging/releases \
-	  | awk -F\" "/wkhtmltopdf.*.${OS_RELEASE}_${DEB_HOST_ARCH}\.deb/{print \$(NF-1)}" \
+	  curl -sS -L --fail 'https://wkhtmltopdf.org/downloads.html' \
+	  | awk -F'"' "/wkhtmltopdf.*${OS_RELEASE}_${DEB_HOST_ARCH}\.deb/{print \$(NF-1)}" \
 	  | head -1 \
 	)" \
 	&& echo "URL: ${WK_URL}" \
@@ -685,6 +686,7 @@ RUN set -eux \
 		dos2unix \
 		file \
 		fontconfig \
+		less \
 		libfontenc1 \
 		libxfont2 \
 		libxrender1 \
--- a/Dockerfiles/work/Dockerfile-7.4
+++ b/Dockerfiles/work/Dockerfile-7.4
@@ -273,6 +273,7 @@ RUN set -eux \
 		dos2unix \
 		file \
 		fontconfig \
+		less \
 		libfontenc1 \
 		libxfont2 \
 		libxrender1 \
@@ -615,8 +616,8 @@ RUN set -eux \
 	&& OS_RELEASE="bullseye"	\
 	&& DEB_HOST_ARCH="$( dpkg-architecture --query DEB_HOST_ARCH )" \
 	&& WK_URL="$( \
-	  curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/packaging/releases \
-	  | awk -F\" "/wkhtmltopdf.*.${OS_RELEASE}_${DEB_HOST_ARCH}\.deb/{print \$(NF-1)}" \
+	  curl -sS -L --fail 'https://wkhtmltopdf.org/downloads.html' \
+	  | awk -F'"' "/wkhtmltopdf.*${OS_RELEASE}_${DEB_HOST_ARCH}\.deb/{print \$(NF-1)}" \
 	  | head -1 \
 	)" \
 	&& echo "URL: ${WK_URL}" \
@@ -685,6 +686,7 @@ RUN set -eux \
 		dos2unix \
 		file \
 		fontconfig \
+		less \
 		libfontenc1 \
 		libxfont2 \
 		libxrender1 \
--- a/Dockerfiles/work/Dockerfile-8.0
+++ b/Dockerfiles/work/Dockerfile-8.0
@@ -273,6 +273,7 @@ RUN set -eux \
 		dos2unix \
 		file \
 		fontconfig \
+		less \
 		libfontenc1 \
 		libxfont2 \
 		libxrender1 \
@@ -615,8 +616,8 @@ RUN set -eux \
 	&& OS_RELEASE="bullseye"	\
 	&& DEB_HOST_ARCH="$( dpkg-architecture --query DEB_HOST_ARCH )" \
 	&& WK_URL="$( \
-	  curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/packaging/releases \
-	  | awk -F\" "/wkhtmltopdf.*.${OS_RELEASE}_${DEB_HOST_ARCH}\.deb/{print \$(NF-1)}" \
+	  curl -sS -L --fail 'https://wkhtmltopdf.org/downloads.html' \
+	  | awk -F'"' "/wkhtmltopdf.*${OS_RELEASE}_${DEB_HOST_ARCH}\.deb/{print \$(NF-1)}" \
 	  | head -1 \
 	)" \
 	&& echo "URL: ${WK_URL}" \
@@ -685,6 +686,7 @@ RUN set -eux \
 		dos2unix \
 		file \
 		fontconfig \
+		less \
 		libfontenc1 \
 		libxfont2 \
 		libxrender1 \
--- a/Dockerfiles/work/Dockerfile-8.1
+++ b/Dockerfiles/work/Dockerfile-8.1
@@ -273,6 +273,7 @@ RUN set -eux \
 		dos2unix \
 		file \
 		fontconfig \
+		less \
 		libfontenc1 \
 		libxfont2 \
 		libxrender1 \
@@ -615,8 +616,8 @@ RUN set -eux \
 	&& OS_RELEASE="bullseye"	\
 	&& DEB_HOST_ARCH="$( dpkg-architecture --query DEB_HOST_ARCH )" \
 	&& WK_URL="$( \
-	  curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/packaging/releases \
-	  | awk -F\" "/wkhtmltopdf.*.${OS_RELEASE}_${DEB_HOST_ARCH}\.deb/{print \$(NF-1)}" \
+	  curl -sS -L --fail 'https://wkhtmltopdf.org/downloads.html' \
+	  | awk -F'"' "/wkhtmltopdf.*${OS_RELEASE}_${DEB_HOST_ARCH}\.deb/{print \$(NF-1)}" \
 	  | head -1 \
 	)" \
 	&& echo "URL: ${WK_URL}" \
@@ -685,6 +686,7 @@ RUN set -eux \
 		dos2unix \
 		file \
 		fontconfig \
+		less \
 		libfontenc1 \
 		libxfont2 \
 		libxrender1 \
--- a/Dockerfiles/work/Dockerfile-8.2
+++ b/Dockerfiles/work/Dockerfile-8.2
@@ -273,6 +273,7 @@ RUN set -eux \
 		dos2unix \
 		file \
 		fontconfig \
+		less \
 		libfontenc1 \
 		libxfont2 \
 		libxrender1 \
@@ -568,8 +569,8 @@ RUN set -eux \
 	&& OS_RELEASE="bullseye"	\
 	&& DEB_HOST_ARCH="$( dpkg-architecture --query DEB_HOST_ARCH )" \
 	&& WK_URL="$( \
-	  curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/packaging/releases \
-	  | awk -F\" "/wkhtmltopdf.*.${OS_RELEASE}_${DEB_HOST_ARCH}\.deb/{print \$(NF-1)}" \
+	  curl -sS -L --fail 'https://wkhtmltopdf.org/downloads.html' \
+	  | awk -F'"' "/wkhtmltopdf.*${OS_RELEASE}_${DEB_HOST_ARCH}\.deb/{print \$(NF-1)}" \
 	  | head -1 \
 	)" \
 	&& echo "URL: ${WK_URL}" \
@@ -638,6 +639,7 @@ RUN set -eux \
 		dos2unix \
 		file \
 		fontconfig \
+		less \
 		libfontenc1 \
 		libxfont2 \
 		libxrender1 \
--- a/php_tools/wkhtmltopdf/install.yml
+++ b/php_tools/wkhtmltopdf/install.yml
@@ -8,8 +8,8 @@ all:
  command: |
    DEB_HOST_ARCH="$( dpkg-architecture --query DEB_HOST_ARCH )" \
    && WK_URL="$( \
-      curl -sSL -L --fail https://api.github.com/repos/wkhtmltopdf/packaging/releases \
-      | awk -F\" "/wkhtmltopdf.*.${OS_RELEASE}_${DEB_HOST_ARCH}\.deb/{print \$(NF-1)}" \
+      curl -sS -L --fail 'https://wkhtmltopdf.org/downloads.html' \
+      | awk -F'"' "/wkhtmltopdf.*${OS_RELEASE}_${DEB_HOST_ARCH}\.deb/{print \$(NF-1)}" \
      | head -1 \
    )" \
    && echo "URL: ${WK_URL}" \
--- a/php_tools/wp-cli/install.yml
+++ b/php_tools/wp-cli/install.yml
@@ -6,7 +6,9 @@ all:
  type: custom
  command: curl -sS -L --fail "${WPCLI_URL}" -L -o /usr/local/bin/wp
  build_dep: []
-  run_dep: []
+  # Fixes: sh: 1: less: not found during 'wp help'
+  # It internally pipes it to less.
+  run_dep: [less]
  pre: WPCLI_URL="https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar"
  post: chmod +x /usr/local/bin/wp