Merge pull request #262 from devilbox/fix-tools

Fix wkhtmltodf and wp-cli installation
devilbox · Dec 15, 2022 · 06cb912 · 06cb912
2 parents a1f7c0c + 9c552b0
commit 06cb912
Show file tree

Hide file tree

Showing 17 changed files with 92 additions and 57 deletions.
diff --git a/.ansible/group_vars/all/work.yml b/.ansible/group_vars/all/work.yml
@@ -623,12 +623,12 @@ 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 -k -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}" \
-        && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb "${WK_URL}" \
+        && curl -sS -k -L --fail -o /tmp/wkhtmltopdf.deb "${WK_URL}" \
         && dpkg -i /tmp/wkhtmltopdf.deb \
         && rm -f /tmp/wkhtmltopdf.deb \
       run_dep:
@@ -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:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,13 @@
 ## Unreleased
 
 
+## Release 0.147
+
+### Fixed
+- Fixed wkhtmltopdf version finder during install
+- Fixed wp-cli runtime requirements (needs `less` in order to function)
+
+
 ## Release 0.146
 
 This release adds lots of documentation about recently added features.

diff --git 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 ----------

diff --git 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 ----------

diff --git 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 ----------

diff --git 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,12 +616,12 @@ 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 -k -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}" \
-	&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb "${WK_URL}" \
+	&& curl -sS -k -L --fail -o /tmp/wkhtmltopdf.deb "${WK_URL}" \
 	&& dpkg -i /tmp/wkhtmltopdf.deb \
 	&& rm -f /tmp/wkhtmltopdf.deb \
 	\
@@ -685,6 +686,7 @@ RUN set -eux \
 		dos2unix \
 		file \
 		fontconfig \
+		less \
 		libfontenc1 \
 		libxfont1 \
 		libxrender1 \

diff --git 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,12 +616,12 @@ 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 -k -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}" \
-	&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb "${WK_URL}" \
+	&& curl -sS -k -L --fail -o /tmp/wkhtmltopdf.deb "${WK_URL}" \
 	&& dpkg -i /tmp/wkhtmltopdf.deb \
 	&& rm -f /tmp/wkhtmltopdf.deb \
 	\
@@ -685,6 +686,7 @@ RUN set -eux \
 		dos2unix \
 		file \
 		fontconfig \
+		less \
 		libfontenc1 \
 		libxfont1 \
 		libxrender1 \

diff --git 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,12 +616,12 @@ 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 -k -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}" \
-	&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb "${WK_URL}" \
+	&& curl -sS -k -L --fail -o /tmp/wkhtmltopdf.deb "${WK_URL}" \
 	&& dpkg -i /tmp/wkhtmltopdf.deb \
 	&& rm -f /tmp/wkhtmltopdf.deb \
 	\
@@ -685,6 +686,7 @@ RUN set -eux \
 		dos2unix \
 		file \
 		fontconfig \
+		less \
 		libfontenc1 \
 		libxfont2 \
 		libxrender1 \

diff --git 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,12 +616,12 @@ 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 -k -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}" \
-	&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb "${WK_URL}" \
+	&& curl -sS -k -L --fail -o /tmp/wkhtmltopdf.deb "${WK_URL}" \
 	&& dpkg -i /tmp/wkhtmltopdf.deb \
 	&& rm -f /tmp/wkhtmltopdf.deb \
 	\
@@ -685,6 +686,7 @@ RUN set -eux \
 		dos2unix \
 		file \
 		fontconfig \
+		less \
 		libfontenc1 \
 		libxfont2 \
 		libxrender1 \

diff --git 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,12 +616,12 @@ 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 -k -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}" \
-	&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb "${WK_URL}" \
+	&& curl -sS -k -L --fail -o /tmp/wkhtmltopdf.deb "${WK_URL}" \
 	&& dpkg -i /tmp/wkhtmltopdf.deb \
 	&& rm -f /tmp/wkhtmltopdf.deb \
 	\
@@ -685,6 +686,7 @@ RUN set -eux \
 		dos2unix \
 		file \
 		fontconfig \
+		less \
 		libfontenc1 \
 		libxfont2 \
 		libxrender1 \

diff --git 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,12 +616,12 @@ 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 -k -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}" \
-	&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb "${WK_URL}" \
+	&& curl -sS -k -L --fail -o /tmp/wkhtmltopdf.deb "${WK_URL}" \
 	&& dpkg -i /tmp/wkhtmltopdf.deb \
 	&& rm -f /tmp/wkhtmltopdf.deb \
 	\
@@ -685,6 +686,7 @@ RUN set -eux \
 		dos2unix \
 		file \
 		fontconfig \
+		less \
 		libfontenc1 \
 		libxfont2 \
 		libxrender1 \

diff --git 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,12 +616,12 @@ 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 -k -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}" \
-	&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb "${WK_URL}" \
+	&& curl -sS -k -L --fail -o /tmp/wkhtmltopdf.deb "${WK_URL}" \
 	&& dpkg -i /tmp/wkhtmltopdf.deb \
 	&& rm -f /tmp/wkhtmltopdf.deb \
 	\
@@ -685,6 +686,7 @@ RUN set -eux \
 		dos2unix \
 		file \
 		fontconfig \
+		less \
 		libfontenc1 \
 		libxfont2 \
 		libxrender1 \

diff --git 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,12 +616,12 @@ 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 -k -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}" \
-	&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb "${WK_URL}" \
+	&& curl -sS -k -L --fail -o /tmp/wkhtmltopdf.deb "${WK_URL}" \
 	&& dpkg -i /tmp/wkhtmltopdf.deb \
 	&& rm -f /tmp/wkhtmltopdf.deb \
 	\
@@ -685,6 +686,7 @@ RUN set -eux \
 		dos2unix \
 		file \
 		fontconfig \
+		less \
 		libfontenc1 \
 		libxfont2 \
 		libxrender1 \

diff --git 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,12 +569,12 @@ 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 -k -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}" \
-	&& curl -sS -L --fail -o /tmp/wkhtmltopdf.deb "${WK_URL}" \
+	&& curl -sS -k -L --fail -o /tmp/wkhtmltopdf.deb "${WK_URL}" \
 	&& dpkg -i /tmp/wkhtmltopdf.deb \
 	&& rm -f /tmp/wkhtmltopdf.deb \
 	\
@@ -638,6 +639,7 @@ RUN set -eux \
 		dos2unix \
 		file \
 		fontconfig \
+		less \
 		libfontenc1 \
 		libxfont2 \
 		libxrender1 \