diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-23 15:10:56 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-23 15:10:56 +0300 |
commit | 6cbe9eaeb3b69ff378e23eec3a5f33caf92b6d16 (patch) | |
tree | 5ed03505f08c978c483fdfe934c849e9a50f9aec /qa/Dockerfile | |
parent | cd40f83527ac4ed4751b4b7849f0416996589d18 (diff) |
Add latest changes from gitlab-org/gitlab@master
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 # |