From 21d7e4400108c9dd120d75cc9e66cef45fb8b191 Mon Sep 17 00:00:00 2001 From: Bastien Abadie <bastien@nextcairn.com> Date: Sun, 26 Jul 2020 22:04:07 +0200 Subject: [PATCH] Use remote CA from wiki --- worker-{{cookiecutter.slug}}/Dockerfile | 3 +-- .../docker/external/dev-ca.pem | 23 ------------------- 2 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 worker-{{cookiecutter.slug}}/docker/external/dev-ca.pem diff --git a/worker-{{cookiecutter.slug}}/Dockerfile b/worker-{{cookiecutter.slug}}/Dockerfile index e429d056..ca9aae79 100644 --- a/worker-{{cookiecutter.slug}}/Dockerfile +++ b/worker-{{cookiecutter.slug}}/Dockerfile @@ -7,8 +7,7 @@ ADD requirements.txt . RUN pip install -r requirements.txt # Add archi local CA -COPY ./docker/external/dev-ca.pem /usr/local/share/ca-certificates/arkindex-dev.crt -RUN update-ca-certificates +RUN curl https://wiki.teklia.com/teklia_dev_ca.pem > /usr/local/share/ca-certificates/arkindex-dev.crt && update-ca-certificates ENV REQUESTS_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt CMD ["python", "worker.py"] diff --git a/worker-{{cookiecutter.slug}}/docker/external/dev-ca.pem b/worker-{{cookiecutter.slug}}/docker/external/dev-ca.pem deleted file mode 100644 index 0184b647..00000000 --- a/worker-{{cookiecutter.slug}}/docker/external/dev-ca.pem +++ /dev/null @@ -1,23 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDzTCCArWgAwIBAgIJAMIk32qc3uH5MA0GCSqGSIb3DQEBCwUAMH0xCzAJBgNV -BAYTAkZSMREwDwYDVQQIDAhJc8ODwqhyZTERMA8GA1UEBwwIR3Jlbm9ibGUxDzAN -BgNVBAoMBlRla2xpYTERMA8GA1UEAwwIQXJraW5kZXgxJDAiBgkqhkiG9w0BCQEW -FWtlcm1vcnZhbnRAdGVrbGlhLmNvbTAeFw0xODA0MDkwODI1MzBaFw00MjExMzAw -ODI1MzBaMH0xCzAJBgNVBAYTAkZSMREwDwYDVQQIDAhJc8ODwqhyZTERMA8GA1UE -BwwIR3Jlbm9ibGUxDzANBgNVBAoMBlRla2xpYTERMA8GA1UEAwwIQXJraW5kZXgx -JDAiBgkqhkiG9w0BCQEWFWtlcm1vcnZhbnRAdGVrbGlhLmNvbTCCASIwDQYJKoZI -hvcNAQEBBQADggEPADCCAQoCggEBALDSzuXMJotLPqA8rK8c1GCK9G54VQKgieG8 -agLOd0a3ALh+Qz9uLSPEPz40zxjXLLMVIYqHW9CynP5su62gdcpZ0CVImF1e0bgF -U+x0RpNFtceh/RixNL5b9XA9Y3By67jpZfjLC9d0WRQOaIOSW/wUTGWUbW0y/OWg -dc5Qihn32icVit8ogfUCBoH8v0OypiF+AmJHFUq2rjCB0fmvLLZscSdMe4XsYLa0 -7eFRdnKesfE3ooQODnoL2zDkDqhY31PRsCrHquHLO0U7v5NhsfUJs5K9COQeCHW3 -q03kOIecoi1otPYGf07MWKn3AR399HifYHjm5+YYBZ9t7MhOkScCAwEAAaNQME4w -HQYDVR0OBBYEFLj6DCMMKOYYQE8KvRRjFJEwxbXUMB8GA1UdIwQYMBaAFLj6DCMM -KOYYQE8KvRRjFJEwxbXUMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEB -AHPpwfg/N4QNgzmK0BV//H6n96C+Vu5E3A71zKsAZj231K+pcwvOWEZHPV/h9fcV -jHQg5crQsZy7CoV2VdTKbprL/F7W+JsUEPrk3xnqnqqIexDm1m8pua1XCLurU+Sy -588XbzNlOGDzfI8kWhWS9rEJWpVvadQ4PhOlORlU7oRgAjCOXZHNLHs6IdS4yUH5 -TqG9Tv3n7503Jyc5gnLzjJdUg7a3r/7awGr6nWZrdSE29ErLVY+NAUQmjkD7A0kD -ds4tZOSq44zthZiwI33Jj56eGcN+MjRcqFuziZnJt/NWPX7F0+4XenGmqmcjvlKO -zFjKKiOsA01MRJmxSUw6CF8= ------END CERTIFICATE----- -- GitLab