Skip to content

Commit 2204af1

Browse files
authored
Merge pull request #2461 from roeldev/feat-add-docker-init-envs
Add additional DOCKER_STEPCA_INIT_* envs
2 parents 8f558df + 61e37b7 commit 2204af1

File tree

1 file changed

+18
-0
lines changed

1 file changed

+18
-0
lines changed

docker/entrypoint.sh

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ function step_ca_init () {
3737
DOCKER_STEPCA_INIT_PROVISIONER_NAME="${DOCKER_STEPCA_INIT_PROVISIONER_NAME:-admin}"
3838
DOCKER_STEPCA_INIT_ADMIN_SUBJECT="${DOCKER_STEPCA_INIT_ADMIN_SUBJECT:-step}"
3939
DOCKER_STEPCA_INIT_ADDRESS="${DOCKER_STEPCA_INIT_ADDRESS:-:9000}"
40+
DOCKER_STEPCA_INIT_ROOT_FILE="${DOCKER_STEPCA_INIT_ROOT_FILE:-"/run/secrets/root_ca.crt"}"
41+
DOCKER_STEPCA_INIT_KEY_FILE="${DOCKER_STEPCA_INIT_KEY_FILE:-"/run/secrets/root_ca_key"}"
42+
DOCKER_STEPCA_INIT_KEY_PASSWORD_FILE="${DOCKER_STEPCA_INIT_KEY_PASSWORD_FILE:-"/run/secrets/root_ca_key_password"}"
4043

4144
local -a setup_args=(
4245
--name "${DOCKER_STEPCA_INIT_NAME}"
@@ -56,6 +59,21 @@ function step_ca_init () {
5659
generate_password > "${STEPPATH}/password"
5760
generate_password > "${STEPPATH}/provisioner_password"
5861
fi
62+
if [ -f "${DOCKER_STEPCA_INIT_ROOT_FILE}" ]; then
63+
setup_args=("${setup_args[@]}" --root "${DOCKER_STEPCA_INIT_ROOT_FILE}")
64+
fi
65+
if [ -f "${DOCKER_STEPCA_INIT_KEY_FILE}" ]; then
66+
setup_args=("${setup_args[@]}" --key "${DOCKER_STEPCA_INIT_KEY_FILE}")
67+
fi
68+
if [ -f "${DOCKER_STEPCA_INIT_KEY_PASSWORD_FILE}" ]; then
69+
setup_args=("${setup_args[@]}" --key-password-file "${DOCKER_STEPCA_INIT_KEY_PASSWORD_FILE}")
70+
fi
71+
if [ -n "${DOCKER_STEPCA_INIT_DEPLOYMENT_TYPE}" ]; then
72+
setup_args=("${setup_args[@]}" --deployment-type "${DOCKER_STEPCA_INIT_DEPLOYMENT_TYPE}")
73+
fi
74+
if [ -n "${DOCKER_STEPCA_INIT_WITH_CA_URL}" ]; then
75+
setup_args=("${setup_args[@]}" --with-ca-url "${DOCKER_STEPCA_INIT_WITH_CA_URL}")
76+
fi
5977
if [ "${DOCKER_STEPCA_INIT_SSH}" == "true" ]; then
6078
setup_args=("${setup_args[@]}" --ssh)
6179
fi

0 commit comments

Comments
 (0)