diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
commit | f64a639bcfa1fc2bc89ca7db268f594306edfd7c (patch) | |
tree | a2c3c2ebcc3b45e596949db485d6ed18ffaacfa1 /qa/Dockerfile | |
parent | bfbc3e0d6583ea1a91f627528bedc3d65ba4b10f (diff) |
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40
Diffstat (limited to 'qa/Dockerfile')
-rw-r--r-- | qa/Dockerfile | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/qa/Dockerfile b/qa/Dockerfile index 76c81d03071..dda882dc5e6 100644 --- a/qa/Dockerfile +++ b/qa/Dockerfile @@ -38,6 +38,14 @@ RUN unzip chromedriver_linux64.zip -d /usr/local/bin RUN rm -f chromedriver_linux64.zip ## +# Install root certificate +# +RUN mkdir -p /usr/share/ca-certificates/gitlab +ADD ./qa/tls_certificates/authority/ca.crt /usr/share/ca-certificates/gitlab/ +RUN echo 'gitlab/ca.crt' >> /etc/ca-certificates.conf +RUN chmod -R 644 /usr/share/ca-certificates/gitlab && update-ca-certificates + +## # Install gcloud and kubectl CLI used in Auto DevOps test to create K8s # clusters # |