From 343148f1f94a7d0b3c8136d062b71209f629f538 Mon Sep 17 00:00:00 2001 From: dresi Date: Wed, 10 Jun 2026 18:14:52 +0200 Subject: [PATCH] fix: use full CA chain in buildkit image --- buildkit/Dockerfile | 3 +- buildkit/{internal-ca.crt => ca-chain.crt} | 34 ++++++++++++++++++++++ buildkit/intermediate-ca.crt | 34 ---------------------- 3 files changed, 35 insertions(+), 36 deletions(-) rename buildkit/{internal-ca.crt => ca-chain.crt} (50%) delete mode 100644 buildkit/intermediate-ca.crt diff --git a/buildkit/Dockerfile b/buildkit/Dockerfile index 7451a23..9907181 100644 --- a/buildkit/Dockerfile +++ b/buildkit/Dockerfile @@ -1,4 +1,3 @@ FROM moby/buildkit:buildx-stable-1 -COPY internal-ca.crt /usr/local/share/ca-certificates/internal-ca.crt -COPY intermediate-ca.crt /usr/local/share/ca-certificates/intermediate-ca.crt +COPY ca-chain.crt /usr/local/share/ca-certificates/ca-chain.crt RUN apk add --no-cache ca-certificates && update-ca-certificates diff --git a/buildkit/internal-ca.crt b/buildkit/ca-chain.crt similarity index 50% rename from buildkit/internal-ca.crt rename to buildkit/ca-chain.crt index 4db0f19..bbdc461 100644 --- a/buildkit/internal-ca.crt +++ b/buildkit/ca-chain.crt @@ -1,4 +1,38 @@ -----BEGIN CERTIFICATE----- +MIIF8zCCA9ugAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwgYoxCzAJBgNVBAYTAkRF +MQ8wDQYDVQQIDAZIZXNzZW4xEzARBgNVBAcMCkdlaXNlbmhlaW0xEDAOBgNVBAoM +B1ByaXZhdGUxCzAJBgNVBAsMAklUMRgwFgYDVQQDDA9QUklWQVRFIFJPT1QgQ0Ex +HDAaBgkqhkiG9w0BCQEWDXBraUBkcmVzaS53dGYwHhcNMjIxMTMwMTMyNTA3WhcN +MjcxMTI5MTMyNTA3WjCBhTELMAkGA1UEBhMCREUxDzANBgNVBAgMBkhlc3NlbjEQ +MA4GA1UECgwHUHJpdmF0ZTELMAkGA1UECwwCSVQxKDAmBgNVBAMMH1BSSVZBVEUg +SU5URVJNRURJQVRFIENBIEZPUiBLM1MxHDAaBgkqhkiG9w0BCQEWDXBraUBkcmVz +aS53dGYwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJydl5dW1gIlv+ +F+Bxz6wAw3ymnyG/TlnZXmLZpB+xRirVoItF1++BvxvbczSF2OWaXlzwYRHC6HAZ +zrAXgejl7g7lL1V3L/zMZfB/IKVduiJFjy3mS4RJwVlBToLVqnJpjWkrbPZuQE5C +qYeddzEDyNkaMKCMpziV9jUpqsguVPe583CAUB81HEB59+R+m6M+HjXESaIKdf/I +2xP7kef/Z9/MCJ6O1sgeKIKwm6zyg5gih2k2k4NDpQ59BDerwtdtEp7uBTdEYR7b +WsAmvuh8+WMQ9jii6fDaVQ/1Tz0qlXkXDcg9xGIvIbr34ffOSSTs+m35koNqkJ9L +1DaOCjB/vvCXaxxBTldqtLdqG/5WUiGSa4J0OwrSJbQ3U2yYn4TmrzfO7BjiiAGK +cdA2/9ApbwX3geE/uU/+tBBH5seQUzOD5iVt+/KNudlqvdsyE0HlWKx80JScbEqS +OHHr6sLKBkFgL4erleSMLw6+5igNuUWVT9O6H2yXYi8HMnOfS/qWzWxtm1g3zYts +ebZvQ7ItW8brsu2MDCK+Le0gWBz7mQLjnKi/fFIhGqizCRl4jvniFO6s75wJpC+b +/+AFH5e0s+Fnq1eKMZzxJtH98qYwkNAHSUX4+5aXcJzafL0kC6zyf9Loy4oUTmOo +cSlmB+coKCeB7veaAjvwvcMeFX50rwIDAQABo2YwZDAdBgNVHQ4EFgQUeYUoge3x +3Cwnn1sLB1Nn+VJv4ZowHwYDVR0jBBgwFoAUakYXuvQEppet8PSJN1kkwLNBCH4w +EgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQEL +BQADggIBAGB7Uv1hcM7uEp9oFy9cQ0dOVtPTy3lQ1MzDRBosQ+djiu3IlLUf0sxQ +4W0Y9r167y/M3wijym6x5SyDoix5rZr8062t6LzALoygE1nztsCjonR3WQMmloW9 +Kup3BlG9SrH4XyeBul0h4rrubIASCzCA5lAlyEV/19i5e3dMsQJsBNjolfjNAho1 +kWrNHmfO/sAPRDfvcRruoZpMWoNl5x563T+XfgJ7OY9edR+JwShMRY4tTkPLqdLm +1wCAjBY8bd7+oBfrhHA3tmCnWdUO3kcsX7V/oXvb47wi5jW6Xl/ucsKNVSOiCgjH +ClK6BPcFIVl2MQo0EWpMrU1SGS2KgRizsXaq9+1DYP9ks88flI1ivwQI2zynPxTa +C8kF8xpX3eI7DHpJDq605ZiN5aPoUq11Xt4RPmN0N9Qui8ZH4XtHpX4bACPtxQRU +jF6OkFNrCO04Nu1kjafDZYM5muLyr7yw12WiY3/E6traCayBJeisDCXP/dOzTepN +s5BICN8u55lUAx+5sXtqqjhlFGcsZXP/JQ///d2bxNZBXUPJVrAQxuRnH0WKJ1k/ +yuB3id+ut7sDcn7bkXBd9ngLvpIPbgzThrYCXGpMZ48+uqsMWq3K8oLUgjnq6xEr +7raZNna5ReBG3zhTvpo+5M8v7UjWOOTgJFq2FGdz0OwdJNvdd8iH +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- MIIGBzCCA++gAwIBAgIUDkrlPsBijsQfGXRnhmcHZmuxD/0wDQYJKoZIhvcNAQEL BQAwgYoxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZIZXNzZW4xEzARBgNVBAcMCkdl aXNlbmhlaW0xEDAOBgNVBAoMB1ByaXZhdGUxCzAJBgNVBAsMAklUMRgwFgYDVQQD diff --git a/buildkit/intermediate-ca.crt b/buildkit/intermediate-ca.crt deleted file mode 100644 index 9d2d1d0..0000000 --- a/buildkit/intermediate-ca.crt +++ /dev/null @@ -1,34 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIF8zCCA9ugAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwgYoxCzAJBgNVBAYTAkRF -MQ8wDQYDVQQIDAZIZXNzZW4xEzARBgNVBAcMCkdlaXNlbmhlaW0xEDAOBgNVBAoM -B1ByaXZhdGUxCzAJBgNVBAsMAklUMRgwFgYDVQQDDA9QUklWQVRFIFJPT1QgQ0Ex -HDAaBgkqhkiG9w0BCQEWDXBraUBkcmVzaS53dGYwHhcNMjIxMTMwMTMyNTA3WhcN -MjcxMTI5MTMyNTA3WjCBhTELMAkGA1UEBhMCREUxDzANBgNVBAgMBkhlc3NlbjEQ -MA4GA1UECgwHUHJpdmF0ZTELMAkGA1UECwwCSVQxKDAmBgNVBAMMH1BSSVZBVEUg -SU5URVJNRURJQVRFIENBIEZPUiBLM1MxHDAaBgkqhkiG9w0BCQEWDXBraUBkcmVz -aS53dGYwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJydl5dW1gIlv+ -F+Bxz6wAw3ymnyG/TlnZXmLZpB+xRirVoItF1++BvxvbczSF2OWaXlzwYRHC6HAZ -zrAXgejl7g7lL1V3L/zMZfB/IKVduiJFjy3mS4RJwVlBToLVqnJpjWkrbPZuQE5C -qYeddzEDyNkaMKCMpziV9jUpqsguVPe583CAUB81HEB59+R+m6M+HjXESaIKdf/I -2xP7kef/Z9/MCJ6O1sgeKIKwm6zyg5gih2k2k4NDpQ59BDerwtdtEp7uBTdEYR7b -WsAmvuh8+WMQ9jii6fDaVQ/1Tz0qlXkXDcg9xGIvIbr34ffOSSTs+m35koNqkJ9L -1DaOCjB/vvCXaxxBTldqtLdqG/5WUiGSa4J0OwrSJbQ3U2yYn4TmrzfO7BjiiAGK -cdA2/9ApbwX3geE/uU/+tBBH5seQUzOD5iVt+/KNudlqvdsyE0HlWKx80JScbEqS -OHHr6sLKBkFgL4erleSMLw6+5igNuUWVT9O6H2yXYi8HMnOfS/qWzWxtm1g3zYts -ebZvQ7ItW8brsu2MDCK+Le0gWBz7mQLjnKi/fFIhGqizCRl4jvniFO6s75wJpC+b -/+AFH5e0s+Fnq1eKMZzxJtH98qYwkNAHSUX4+5aXcJzafL0kC6zyf9Loy4oUTmOo -cSlmB+coKCeB7veaAjvwvcMeFX50rwIDAQABo2YwZDAdBgNVHQ4EFgQUeYUoge3x -3Cwnn1sLB1Nn+VJv4ZowHwYDVR0jBBgwFoAUakYXuvQEppet8PSJN1kkwLNBCH4w -EgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQEL -BQADggIBAGB7Uv1hcM7uEp9oFy9cQ0dOVtPTy3lQ1MzDRBosQ+djiu3IlLUf0sxQ -4W0Y9r167y/M3wijym6x5SyDoix5rZr8062t6LzALoygE1nztsCjonR3WQMmloW9 -Kup3BlG9SrH4XyeBul0h4rrubIASCzCA5lAlyEV/19i5e3dMsQJsBNjolfjNAho1 -kWrNHmfO/sAPRDfvcRruoZpMWoNl5x563T+XfgJ7OY9edR+JwShMRY4tTkPLqdLm -1wCAjBY8bd7+oBfrhHA3tmCnWdUO3kcsX7V/oXvb47wi5jW6Xl/ucsKNVSOiCgjH -ClK6BPcFIVl2MQo0EWpMrU1SGS2KgRizsXaq9+1DYP9ks88flI1ivwQI2zynPxTa -C8kF8xpX3eI7DHpJDq605ZiN5aPoUq11Xt4RPmN0N9Qui8ZH4XtHpX4bACPtxQRU -jF6OkFNrCO04Nu1kjafDZYM5muLyr7yw12WiY3/E6traCayBJeisDCXP/dOzTepN -s5BICN8u55lUAx+5sXtqqjhlFGcsZXP/JQ///d2bxNZBXUPJVrAQxuRnH0WKJ1k/ -yuB3id+ut7sDcn7bkXBd9ngLvpIPbgzThrYCXGpMZ48+uqsMWq3K8oLUgjnq6xEr -7raZNna5ReBG3zhTvpo+5M8v7UjWOOTgJFq2FGdz0OwdJNvdd8iH ------END CERTIFICATE-----