diff --git a/Dockerfile b/Dockerfile index 547bfb257..2aa5a672e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,8 +8,13 @@ LABEL maintainer="LCM " LABEL git_repository_url="https://github.com/gooddata/gooddata-ruby/" LABEL parent_image="020413372491.dkr.ecr.us-east-1.amazonaws.com/tools/gdc-java-11-jre-centos9:202607101511.b527cf7b" +COPY ci/ca-blocklist/ /etc/pki/ca-trust/source/blocklist/ + # which is required by RVM RUN yum install -y gcc gcc-c++ which patch make unzip gnupg git maven procps gzip \ + && yum update -y ca-certificates \ + && update-ca-trust \ + && ! grep -q '^# emSign ECC Root CA - G3$' /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem \ && yum clean all \ && rm -rf /var/cache/yum diff --git a/DockerfileOldImage b/DockerfileOldImage index 9d1e7921a..238f6ca67 100644 --- a/DockerfileOldImage +++ b/DockerfileOldImage @@ -10,8 +10,13 @@ LABEL maintainer="LCM " LABEL git_repository_url="https://github.com/gooddata/gooddata-ruby/" LABEL parent_image="020413372491.dkr.ecr.us-east-1.amazonaws.com/tools/gdc-java-11-jre-centos9:202607101511.b527cf7b" +COPY ci/ca-blocklist/ /etc/pki/ca-trust/source/blocklist/ + # which is required by RVM RUN yum install -y gcc gcc-c++ diffutils curl-minimal which patch make git maven procps \ + && yum update -y ca-certificates \ + && update-ca-trust \ + && ! grep -q '^# emSign ECC Root CA - G3$' /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem \ && yum clean all \ && rm -rf /var/cache/yum diff --git a/VERSION b/VERSION index f05c78f23..630b9a3a1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.7.109 +3.7.110 diff --git a/ci/ca-blocklist/emsign-ecc-root-ca-g3.pem b/ci/ca-blocklist/emsign-ecc-root-ca-g3.pem new file mode 100644 index 000000000..060e943bf --- /dev/null +++ b/ci/ca-blocklist/emsign-ecc-root-ca-g3.pem @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICTjCCAdOgAwIBAgIKPPYHqWhwDtqLhDAKBggqhkjOPQQDAzBrMQswCQYDVQQG +EwJJTjETMBEGA1UECxMKZW1TaWduIFBLSTElMCMGA1UEChMcZU11ZGhyYSBUZWNo +bm9sb2dpZXMgTGltaXRlZDEgMB4GA1UEAxMXZW1TaWduIEVDQyBSb290IENBIC0g +RzMwHhcNMTgwMjE4MTgzMDAwWhcNNDMwMjE4MTgzMDAwWjBrMQswCQYDVQQGEwJJ +TjETMBEGA1UECxMKZW1TaWduIFBLSTElMCMGA1UEChMcZU11ZGhyYSBUZWNobm9s +b2dpZXMgTGltaXRlZDEgMB4GA1UEAxMXZW1TaWduIEVDQyBSb290IENBIC0gRzMw +djAQBgcqhkjOPQIBBgUrgQQAIgNiAAQjpQy4LRL1KPOxst3iAhKAnjlfSU2fySU0 +WXTsuwYc58Byr+iuL+FBVIcUqEqy6HyC5ltqtdyzdc6LBtCGI79G1Y4PPwT01xyS +fvalY8L1X44uT6EYGQIrMgqCZH0Wk9GjQjBAMB0GA1UdDgQWBBR8XQKEE9TMipuB +zhccLikenEhjQjAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggq +hkjOPQQDAwNpADBmAjEAvvNhzwIQHWSVB7gYboiFBS+DCBeQyh+KTOgNG3qxrdWB +CUfvO6wIBHxcmbHtRwfSAjEAnbpV/KlK6O3t5nYBQnvI+GDZjVGLVTv7jHvrZQnD ++JbNR6iC8hZVdyR+EhCVBCyj +-----END CERTIFICATE-----