From 20c7c2c9381d37230667d25e6646842d23dcfe0c Mon Sep 17 00:00:00 2001
From: Serge Bazanski <q3k@q3k.org>
Date: Sun, 13 Aug 2023 17:09:50 +0200
Subject: [PATCH] ci: add cacert to docker image
---
.gitlab-ci.yml | 2 +-
nix/docker-image.nix | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9b73d35227..8f689f8366 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ variables:
default:
# built via:
# docker load < $(nix-build nix/docker-image.nix)
- image: registry.k0.hswaw.net/q3k/flow3r-build:n7b7mjzzpf20jfdbmv1j1cl55n8x01xx
+ image: registry.k0.hswaw.net/q3k/flow3r-build:ymrsh8w1z9l89qvvksw52k7sl54lx73q
clang-tidy:
stage: check
diff --git a/nix/docker-image.nix b/nix/docker-image.nix
index 6f63a5db4b..37494c62a1 100644
--- a/nix/docker-image.nix
+++ b/nix/docker-image.nix
@@ -32,6 +32,7 @@ pkgs.dockerTools.buildImage {
git wget gnumake
cmake ninja pkgconfig
gnutar curl bzip2
+ cacert
];
pathsToLink = [ "/bin" ];
};
@@ -48,6 +49,7 @@ pkgs.dockerTools.buildImage {
"IDF_PATH=${pkgs.esp-idf}"
"IDF_COMPONENT_MANAGER=0"
"TMPDIR=/tmp"
+ "NIX_SSL_CERT_FILE=${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"
];
};
}
--
GitLab