diff --git a/.ansible/group_vars/all/work.yml b/.ansible/group_vars/all/work.yml index 133826a..15758be 100644 --- 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: diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index fdc0339..f213050 100644 --- 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 index 1663791..6434567 100644 --- 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 index 6b346bb..5fe0713 100644 --- 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 index ee00b61..c25e34b 100644 --- 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 \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index 81eb367..dfba8f3 100644 --- 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 \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index c2b8d06..85c3f7b 100644 --- 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 \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index 0573cb7..0a4fda3 100644 --- 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 \ diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index f9da98c..7d8618e 100644 --- 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 \ diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index 3bc68e6..230e242 100644 --- 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 \ diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0 index f0f070b..68f602f 100644 --- 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 \ diff --git a/Dockerfiles/work/Dockerfile-8.1 b/Dockerfiles/work/Dockerfile-8.1 index 94a2038..b3fb8b8 100644 --- 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 \ diff --git a/Dockerfiles/work/Dockerfile-8.2 b/Dockerfiles/work/Dockerfile-8.2 index 5d7557b..a0200a4 100644 --- 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 \ diff --git a/php_tools/wkhtmltopdf/install.yml b/php_tools/wkhtmltopdf/install.yml index 286f7d0..b2f58de 100644 --- 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}" \ diff --git a/php_tools/wp-cli/install.yml b/php_tools/wp-cli/install.yml index 4039379..d08a386 100644 --- 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