From c4c0484e6193ed684e5f7b8c48a26a80ceb24278 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Mon, 22 Nov 2021 11:27:15 +0100 Subject: [PATCH] ci: upgrade ca-certificates in Linux Docker image MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Otherwise cloning of BearSSL fails with: ``` Cloning into '/home/jenkins/workspace/status-desktop/platforms/linux/vendor/status-lib/vendor/nim-task-runner/vendor/nim-bearssl/bearssl/csources'... fatal: unable to access 'https://www.bearssl.org/git/BearSSL/': server certificate verification failed. CAfile: /etc/ssl/certs/ca-certificates.crt CRLfile: none fatal: clone of 'https://www.bearssl.org/git/BearSSL' into submodule path '/home/jenkins/workspace/status-desktop/platforms/linux/vendor/status-lib/vendor/nim-task-runner/vendor/nim-bearssl/bearssl/csources' failed Failed to clone 'bearssl/csources'. Retry scheduled ``` https://blog.dnsimple.com/2021/09/letsencrypt-intermediate-expiration/ Signed-off-by: Jakub SokoĊ‚owski --- ci/Dockerfile | 7 +++---- ci/Jenkinsfile.linux | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ci/Dockerfile b/ci/Dockerfile index ea07400f2c..be36227279 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -16,12 +16,11 @@ RUN export DEBIAN_FRONTEND=noninteractive \ && sudo apt update -yq \ && sudo apt purge -yq gnupg \ && sudo apt install -yq --fix-missing \ - build-essential cmake jq git s3cmd gnupg2 \ - libpcre3-dev libnss3 libxcomposite1 libxtst6 \ + build-essential cmake jq git s3cmd gnupg2 ca-certificates \ + libpcre3-dev libnss3 libxcomposite1 libxtst6 libpcsclite-dev \ gstreamer1.0-plugins-good gstreamer1.0-plugins-bad \ gstreamer1.0-plugins-ugly gstreamer1.0-libav \ - gstreamer1.0-tools gstreamer1.0-alsa gstreamer1.0-pulseaudio \ - libpcsclite-dev + gstreamer1.0-tools gstreamer1.0-alsa gstreamer1.0-pulseaudio # Installing Golang RUN GOLANG_SHA256="d2c095c95f63c2a3ef961000e0ecb9d81d5c68b6ece176e2a8a2db82dc02931c" \ diff --git a/ci/Jenkinsfile.linux b/ci/Jenkinsfile.linux index 8342dc9247..ad208443b3 100644 --- a/ci/Jenkinsfile.linux +++ b/ci/Jenkinsfile.linux @@ -4,7 +4,7 @@ pipeline { agent { docker { label 'linux' - image 'statusteam/nim-status-client-build:1.1.0' + image 'statusteam/nim-status-client-build:1.1.1' /* allows jenkins use cat and mounts '/dev/fuse' for linuxdeployqt */ args '--entrypoint="" --cap-add SYS_ADMIN --security-opt apparmor:unconfined --device /dev/fuse' }