mbiryukova/certificates
1
0
Fork 0
forked from TrueCloudLab/certificates
Code Pull requests Activity

No need for PROVISIONER_PWDPATH

Browse source
This commit is contained in:
Carl Tashian 2023-01-09 17:23:47 -08:00
parent 313bf2354b
commit a017238874
No known key found for this signature in database
3 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docker/Dockerfile.step-ca
View file

@ -19,7 +19,6 @@ USER step
ENV CONFIGPATH="/home/step/config/ca.json" ENV CONFIGPATH="/home/step/config/ca.json"
ENV PWDPATH="/home/step/secrets/password" ENV PWDPATH="/home/step/secrets/password"
ENV PROVISIONER_PWDPATH="/home/step/secrets/provisioner_password"
VOLUME ["/home/step"] VOLUME ["/home/step"]
STOPSIGNAL SIGTERM STOPSIGNAL SIGTERM
@ -28,4 +27,4 @@ HEALTHCHECK CMD step ca health 2>/dev/null | grep "^ok" >/dev/null
COPY docker/entrypoint.sh /entrypoint.sh COPY docker/entrypoint.sh /entrypoint.sh
ENTRYPOINT ["/bin/bash", "/entrypoint.sh"] ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]
CMD exec /usr/local/bin/step-ca --password-file $PWDPATH --provisioner-password-file $PROVISIONER_PWDPATH $CONFIGPATH CMD exec /usr/local/bin/step-ca --password-file $PWDPATH $CONFIGPATH

3
docker/Dockerfile.step-ca.hsm
View file

@ -24,7 +24,6 @@ USER step
ENV CONFIGPATH="/home/step/config/ca.json" ENV CONFIGPATH="/home/step/config/ca.json"
ENV PWDPATH="/home/step/secrets/password" ENV PWDPATH="/home/step/secrets/password"
ENV PROVISIONER_PWDPATH="/home/step/secrets/provisioner_password"
VOLUME ["/home/step"] VOLUME ["/home/step"]
STOPSIGNAL SIGTERM STOPSIGNAL SIGTERM
@ -33,4 +32,4 @@ HEALTHCHECK CMD step ca health 2>/dev/null | grep "^ok" >/dev/null
COPY docker/entrypoint.sh /entrypoint.sh COPY docker/entrypoint.sh /entrypoint.sh
ENTRYPOINT ["/bin/bash", "/entrypoint.sh"] ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]
CMD exec /usr/local/bin/step-ca --password-file $PWDPATH --provisioner-password-file $PROVISIONER_PWDPATH $CONFIGPATH CMD exec /usr/local/bin/step-ca --password-file $PWDPATH $CONFIGPATH

8
docker/entrypoint.sh
View file

@ -60,7 +60,6 @@ function step_ca_init () {
fi fi
step ca init "${setup_args[@]}" step ca init "${setup_args[@]}"
mv $STEPPATH/password $PWDPATH mv $STEPPATH/password $PWDPATH
mv $STEPPATH/provisioner_password $PROVISIONER_PWDPATH
} }
if [ -f /usr/sbin/pcscd ]; then if [ -f /usr/sbin/pcscd ]; then
@ -71,11 +70,4 @@ if [ ! -f "${STEPPATH}/config/ca.json" ]; then
init_if_possible init_if_possible
fi fi
if [ -f "${PWDPATH}" ] && [ ! -f "${PROVISIONER_PWDPATH}" ]; then
# For backward compatibility,
# if the --provisioner-password-file doesn't exist,
# use the same password as the CA.
cp ${PWDPATH} ${PROVISIONER_PWDPATH}
fi
exec "${@}" exec "${@}"