From 268ea23ed45fcb9db667d200b79eff829f8a0cea Mon Sep 17 00:00:00 2001 From: Martin Norling Date: Fri, 4 Nov 2022 11:52:38 +0100 Subject: [PATCH] use neicnordic/sda-helm-tests-support for certgen --- dev_utils/certfixer/Dockerfile | 12 ------------ dev_utils/certfixer/make_certs.sh | 2 +- dev_utils/docker-compose.yml | 6 ++++-- 3 files changed, 5 insertions(+), 15 deletions(-) delete mode 100644 dev_utils/certfixer/Dockerfile diff --git a/dev_utils/certfixer/Dockerfile b/dev_utils/certfixer/Dockerfile deleted file mode 100644 index 40ef171..0000000 --- a/dev_utils/certfixer/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM alpine:3.16 - -RUN apk add openssl - -RUN mkdir -p /certfixer - -ADD ./make_certs.sh /certfixer/make_certs.sh -ADD ./ssl.cnf /certfixer/ssl.cnf - -WORKDIR /certfixer - -CMD ["/bin/sh", "make_certs.sh"] diff --git a/dev_utils/certfixer/make_certs.sh b/dev_utils/certfixer/make_certs.sh index 63bb321..88f4e14 100644 --- a/dev_utils/certfixer/make_certs.sh +++ b/dev_utils/certfixer/make_certs.sh @@ -62,7 +62,7 @@ openssl x509 -req -in "$out_dir/client.csr" -days 1200 -CA "$out_dir/ca.crt" -CA # fix permissions chmod 644 "$out_dir"/* -chown -R nobody.nobody "$out_dir"/* +chown -R root:root "$out_dir"/* chmod 600 "$out_dir"/*-key.pem # move certificates to volumes diff --git a/dev_utils/docker-compose.yml b/dev_utils/docker-compose.yml index 0c04bf4..f9faf92 100644 --- a/dev_utils/docker-compose.yml +++ b/dev_utils/docker-compose.yml @@ -1,8 +1,10 @@ services: certfixer: - build: - context: ./certfixer + image: neicnordic/sda-helm-tests-support:latest + command: /bin/sh /certfixer/make_certs.sh + user: "0:0" volumes: + - ./certfixer:/certfixer - pubcert:/pubcert - s3_certs:/s3_certs - mq_certs:/mq_certs