diff options
| author | Kristofer Hallin <kristofer@sunet.se> | 2022-02-04 10:21:50 +0100 |
|---|---|---|
| committer | Kristofer Hallin <kristofer@sunet.se> | 2022-02-04 10:21:50 +0100 |
| commit | 17832e6b26e0dfb26bbcfa05d2ac7e201c3544f2 (patch) | |
| tree | ad09e4cdca6dac862b273115b83112b176aa062a | |
| parent | e6f8411d4289ecc8dfec8ea3edea9e8688b9a02f (diff) | |
Use volume for certs.
| -rw-r--r-- | docker/docker-compose-dev.yaml | 4 | ||||
| -rw-r--r-- | docker/docker-compose.yaml | 3 | ||||
| -rw-r--r-- | docker/nginx/Dockerfile | 6 | ||||
| -rw-r--r-- | docker/nginx/certs/soc_collector-key.pem (renamed from docker/nginx/soc_collector-key.pem) | 0 | ||||
| -rw-r--r-- | docker/nginx/certs/soc_collector.pem (renamed from docker/nginx/soc_collector.pem) | 0 | ||||
| -rw-r--r-- | docker/nginx/default.conf | 4 |
6 files changed, 10 insertions, 7 deletions
diff --git a/docker/docker-compose-dev.yaml b/docker/docker-compose-dev.yaml index 9c7f247..ead32e0 100644 --- a/docker/docker-compose-dev.yaml +++ b/docker/docker-compose-dev.yaml @@ -7,6 +7,8 @@ services: - 1443:443 depends_on: - collector + volumes: + - certs:/etc/ssl/collector/ collector: build: @@ -37,4 +39,4 @@ services: volumes: couchdb-data: - external: false + certs: diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index 3160b72..23a543b 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -6,6 +6,8 @@ services: - 1443:443 depends_on: - collector + volumes: + - certs:/etc/ssl/collector/ collector: build: ./collector/ @@ -35,3 +37,4 @@ services: volumes: couchdb-data: external: false + certs: diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile index 7a880c5..308a88d 100644 --- a/docker/nginx/Dockerfile +++ b/docker/nginx/Dockerfile @@ -1,7 +1,5 @@ FROM nginx -COPY soc_collector.pem /etc/ssl/ -COPY soc_collector-key.pem /etc/ssl/ - +COPY soc_collector.pem /etc/ssl/collector/ +COPY soc_collector-key.pem /etc/ssl/collector/ COPY default.conf /etc/nginx/conf.d/default.conf - diff --git a/docker/nginx/soc_collector-key.pem b/docker/nginx/certs/soc_collector-key.pem index 91b47df..91b47df 100644 --- a/docker/nginx/soc_collector-key.pem +++ b/docker/nginx/certs/soc_collector-key.pem diff --git a/docker/nginx/soc_collector.pem b/docker/nginx/certs/soc_collector.pem index 4c9afc8..4c9afc8 100644 --- a/docker/nginx/soc_collector.pem +++ b/docker/nginx/certs/soc_collector.pem diff --git a/docker/nginx/default.conf b/docker/nginx/default.conf index 2a00e78..35eb2a2 100644 --- a/docker/nginx/default.conf +++ b/docker/nginx/default.conf @@ -2,8 +2,8 @@ server { listen 443 ssl; server_name _; - ssl_certificate /etc/ssl/soc_collector.pem; - ssl_certificate_key /etc/ssl/soc_collector-key.pem; + ssl_certificate /etc/ssl/collector/soc_collector.pem; + ssl_certificate_key /etc/ssl/collector/soc_collector-key.pem; access_log /var/log/nginx/access.log; error_log /var/log/nginx/error.log warn; |