X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fplatform%2Fcomponents%2Foom-cert-service%2FMakefile;h=736a19fbd4b4a73327e96912024a2a28b286c8ec;hb=bf66cd5f6b6e87586f433c358370cfd5d1447933;hp=c4723dfdd1979da9b54085d93c7f397f5bad1f07;hpb=1418b0127785ae145a83190b51b0d032e3e41d94;p=oom.git

diff --git a/kubernetes/platform/components/oom-cert-service/Makefile b/kubernetes/platform/components/oom-cert-service/Makefile
index c4723dfdd1..736a19fbd4 100644
--- a/kubernetes/platform/components/oom-cert-service/Makefile
+++ b/kubernetes/platform/components/oom-cert-service/Makefile
@@ -27,7 +27,12 @@ all: start_docker \
 # Starts docker container for generating certificates - deletes first, if already running
 start_docker:
 	@make stop_docker
-	docker run -d --rm --name ${DOCKER_CONTAINER}  --mount type=bind,source=${CURRENT_DIR}/${CERTS_DIR},target=/certs -w /certs docker.io/openjdk:11-jre-slim tail -f /dev/null
+	$(eval REPOSITORY := $(shell cat ./values.yaml | grep -i "^[ \t]*repository" -m1 | xargs | cut -d ' ' -f2))
+	$(eval JAVA_IMAGE := $(shell cat ./values.yaml | grep -i "^[ \t]*certificateGenerationImage" -m1 | xargs | cut -d ' ' -f2))
+	$(eval FULL_JAVA_IMAGE := $(REPOSITORY)/$(JAVA_IMAGE))
+	$(eval USERNAME :=$(shell id -u))
+	$(eval GROUP :=$(shell id -g))
+	docker run --rm --name ${DOCKER_CONTAINER} --user "$(USERNAME):$(GROUP)" --mount type=bind,source=${CURRENT_DIR}/${CERTS_DIR},target=/app -w /app --entrypoint "sh" -td $(FULL_JAVA_IMAGE)
 
 # Stops docker container for generating  certificates. 'true' is used to return 0 status code, if container is already deleted
 stop_docker:
@@ -89,7 +94,7 @@ client_sign_certificate_by_root:
 #Import root certificate into client
 client_import_root_certificate:
 	@echo "Import root certificate into intermediate"
-	${DOCKER_EXEC} bash -c "cat root.crt >> certServiceClientByRoot.crt"
+	${DOCKER_EXEC} sh -c "cat root.crt >> certServiceClientByRoot.crt"
 	@echo "####done####"
 
 #Import signed certificate into certService's client
@@ -124,7 +129,7 @@ server_sign_certificate_by_root:
 #Import root certificate into server
 server_import_root_certificate:
 	@echo "Import root certificate into intermediate(server)"
-	${DOCKER_EXEC} bash -c "cat root.crt >> certServiceServerByRoot.crt"
+	${DOCKER_EXEC} sh -c "cat root.crt >> certServiceServerByRoot.crt"
 	@echo "####done####"
 
 #Import signed certificate into certService