Merge pull request #583 from Conky5/use-different-image-for-random-key

Use busybox for key generation in testing
elastic · Apr 15, 2020 · 61c3a05 · 61c3a05
2 parents 469ef3f + 6908249
commit 61c3a05
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/elasticsearch/examples/security/Makefile b/elasticsearch/examples/security/Makefile
@@ -20,7 +20,7 @@ pull-elasticsearch-image:
 secrets:
 	docker rm -f elastic-helm-charts-certs || true
 	rm -f elastic-certificates.p12 elastic-certificate.pem elastic-stack-ca.p12 || true
-	password=$$([ ! -z "$$ELASTIC_PASSWORD" ] && echo $$ELASTIC_PASSWORD || echo $$(docker run --rm $(ELASTICSEARCH_IMAGE) /bin/sh -c "< /dev/urandom tr -cd '[:alnum:]' | head -c20")) && \
+	password=$$([ ! -z "$$ELASTIC_PASSWORD" ] && echo $$ELASTIC_PASSWORD || echo $$(docker run --rm busybox:1.31.1 /bin/sh -c "< /dev/urandom tr -cd '[:alnum:]' | head -c20")) && \
 	docker run --name elastic-helm-charts-certs -i -w /app \
 		$(ELASTICSEARCH_IMAGE) \
 		/bin/sh -c " \

diff --git a/kibana/examples/security/Makefile b/kibana/examples/security/Makefile
@@ -13,5 +13,5 @@ purge:
 	helm del --purge $(RELEASE)
 
 secrets:
-	encryptionkey=$$(echo $$(docker run --rm docker.elastic.co/elasticsearch/elasticsearch:$(STACK_VERSION) /bin/sh -c "< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c50")) && \
+	encryptionkey=$$(docker run --rm busybox:1.31.1 /bin/sh -c "< /dev/urandom tr -dc _A-Za-z0-9 | head -c50") && \
 	kubectl create secret generic kibana --from-literal=encryptionkey=$$encryptionkey