From bc63829111dbcb6ada9a776c71c84deaa5187754 Mon Sep 17 00:00:00 2001
From: Carl Tashian <carl@smallstep.com>
Date: Wed, 18 Aug 2021 11:11:05 -0700
Subject: [PATCH] Auto-generate password by default

---
 docker/entrypoint.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 583e2e97..a6d29768 100644
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -37,11 +37,6 @@ function generate_password () {
 
 # Initialize a CA if not already initialized
 function step_ca_init () {
-    if [ -n "${DOCKER_STEPCA_INIT_PASSWORD}" ]; then
-        echo -n "${DOCKER_STEPCA_INIT_PASSWORD}" > "${STEPPATH}/password"
-    else
-        generate_password > "${STEPPATH}/password"
-    fi
     local -a setup_args=(
         --name "${DOCKER_STEPCA_INIT_NAME}"
 		--dns "${DOCKER_STEPCA_INIT_DNS}"
@@ -49,6 +44,11 @@ function step_ca_init () {
 		--password-file "${STEPPATH}/password"
         --address ":9000"
     )
+    if [ -n "${DOCKER_STEPCA_INIT_PASSWORD}" ]; then
+        echo -n "${DOCKER_STEPCA_INIT_PASSWORD}" > "${STEPPATH}/password"
+    else
+        generate_password > "${STEPPATH}/password"
+    fi
     if [ -n "${DOCKER_STEPCA_INIT_SSH}" ]; then
         setup_args=("${setup_args[@]}" --ssh)
     fi