From 5613a402475af2d22e73792cea7e5c81ccab5401 Mon Sep 17 00:00:00 2001 From: dvlbot Date: Wed, 14 Dec 2022 18:50:57 +0100 Subject: [PATCH] Ignore expired certs during version check --- .ansible/group_vars/all/work.yml | 4 ++-- Dockerfiles/work/Dockerfile-5.6 | 4 ++-- Dockerfiles/work/Dockerfile-7.0 | 4 ++-- Dockerfiles/work/Dockerfile-7.1 | 4 ++-- Dockerfiles/work/Dockerfile-7.2 | 4 ++-- Dockerfiles/work/Dockerfile-7.3 | 4 ++-- Dockerfiles/work/Dockerfile-7.4 | 4 ++-- Dockerfiles/work/Dockerfile-8.0 | 4 ++-- Dockerfiles/work/Dockerfile-8.1 | 4 ++-- Dockerfiles/work/Dockerfile-8.2 | 4 ++-- php_tools/wkhtmltopdf/install.yml | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.ansible/group_vars/all/work.yml b/.ansible/group_vars/all/work.yml index 15758be..670ef9a 100644 --- 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 -sS -L --fail 'https://wkhtmltopdf.org/downloads.html' \ + 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: diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index c25e34b..3f67cb8 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -616,12 +616,12 @@ RUN set -eux \ && OS_RELEASE="stretch" \ && DEB_HOST_ARCH="$( dpkg-architecture --query DEB_HOST_ARCH )" \ && WK_URL="$( \ - curl -sS -L --fail 'https://wkhtmltopdf.org/downloads.html' \ + 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 \ \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index dfba8f3..3473d7c 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -616,12 +616,12 @@ RUN set -eux \ && OS_RELEASE="stretch" \ && DEB_HOST_ARCH="$( dpkg-architecture --query DEB_HOST_ARCH )" \ && WK_URL="$( \ - curl -sS -L --fail 'https://wkhtmltopdf.org/downloads.html' \ + 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 \ \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index 85c3f7b..7f99afb 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -616,12 +616,12 @@ RUN set -eux \ && OS_RELEASE="buster" \ && DEB_HOST_ARCH="$( dpkg-architecture --query DEB_HOST_ARCH )" \ && WK_URL="$( \ - curl -sS -L --fail 'https://wkhtmltopdf.org/downloads.html' \ + 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 \ \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index 0a4fda3..61391f9 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -616,12 +616,12 @@ RUN set -eux \ && OS_RELEASE="buster" \ && DEB_HOST_ARCH="$( dpkg-architecture --query DEB_HOST_ARCH )" \ && WK_URL="$( \ - curl -sS -L --fail 'https://wkhtmltopdf.org/downloads.html' \ + 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 \ \ diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index 7d8618e..0072052 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -616,12 +616,12 @@ RUN set -eux \ && OS_RELEASE="bullseye" \ && DEB_HOST_ARCH="$( dpkg-architecture --query DEB_HOST_ARCH )" \ && WK_URL="$( \ - curl -sS -L --fail 'https://wkhtmltopdf.org/downloads.html' \ + 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 \ \ diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index 230e242..8f2c088 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -616,12 +616,12 @@ RUN set -eux \ && OS_RELEASE="bullseye" \ && DEB_HOST_ARCH="$( dpkg-architecture --query DEB_HOST_ARCH )" \ && WK_URL="$( \ - curl -sS -L --fail 'https://wkhtmltopdf.org/downloads.html' \ + 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 \ \ diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0 index 68f602f..cf606ff 100644 --- a/Dockerfiles/work/Dockerfile-8.0 +++ b/Dockerfiles/work/Dockerfile-8.0 @@ -616,12 +616,12 @@ RUN set -eux \ && OS_RELEASE="bullseye" \ && DEB_HOST_ARCH="$( dpkg-architecture --query DEB_HOST_ARCH )" \ && WK_URL="$( \ - curl -sS -L --fail 'https://wkhtmltopdf.org/downloads.html' \ + 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 \ \ diff --git a/Dockerfiles/work/Dockerfile-8.1 b/Dockerfiles/work/Dockerfile-8.1 index b3fb8b8..ce0efde 100644 --- a/Dockerfiles/work/Dockerfile-8.1 +++ b/Dockerfiles/work/Dockerfile-8.1 @@ -616,12 +616,12 @@ RUN set -eux \ && OS_RELEASE="bullseye" \ && DEB_HOST_ARCH="$( dpkg-architecture --query DEB_HOST_ARCH )" \ && WK_URL="$( \ - curl -sS -L --fail 'https://wkhtmltopdf.org/downloads.html' \ + 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 \ \ diff --git a/Dockerfiles/work/Dockerfile-8.2 b/Dockerfiles/work/Dockerfile-8.2 index a0200a4..e308ace 100644 --- a/Dockerfiles/work/Dockerfile-8.2 +++ b/Dockerfiles/work/Dockerfile-8.2 @@ -569,12 +569,12 @@ RUN set -eux \ && OS_RELEASE="bullseye" \ && DEB_HOST_ARCH="$( dpkg-architecture --query DEB_HOST_ARCH )" \ && WK_URL="$( \ - curl -sS -L --fail 'https://wkhtmltopdf.org/downloads.html' \ + 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 \ \ diff --git a/php_tools/wkhtmltopdf/install.yml b/php_tools/wkhtmltopdf/install.yml index b2f58de..4fcadfb 100644 --- a/php_tools/wkhtmltopdf/install.yml +++ b/php_tools/wkhtmltopdf/install.yml @@ -8,12 +8,12 @@ all: command: | DEB_HOST_ARCH="$( dpkg-architecture --query DEB_HOST_ARCH )" \ && WK_URL="$( \ - curl -sS -L --fail 'https://wkhtmltopdf.org/downloads.html' \ + 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: