Merge branch 'master' into herman/allow-deny

.github/PULL_REQUEST_TEMPLATE

@@ -1,4 +1,20 @@
-### Description
-Please describe your pull request.
+<!---
+Please provide answers in the spaces below each prompt, where applicable.
+Not every PR requires responses for each prompt.
+Use your discretion.
+-->
+#### Name of feature:
+
+#### Pain or issue this feature alleviates:
+
+#### Why is this important to the project (if not answered above):
+
+#### Is there documentation on how to use this feature? If so, where?
+
+#### In what environments or workflows is this feature supported?
+
+#### In what environments or workflows is this feature explicitly NOT supported (if any)?
+
+#### Supporting links/other PRs/issues:
 
 💔Thank you!

docker/Dockerfile.step-ca

@@ -3,15 +3,15 @@ FROM golang:alpine AS builder
 WORKDIR /src
 COPY . .
 
-RUN apk add --no-cache \
-   curl \
-   git \
-   make && \
-   make V=1 bin/step-ca
+RUN apk add --no-cache curl git make
+RUN make V=1 bin/step-ca bin/step-awskms-init bin/step-cloudkms-init
+
 
 FROM smallstep/step-cli:latest
 
 COPY --from=builder /src/bin/step-ca /usr/local/bin/step-ca
+COPY --from=builder /src/bin/step-awskms-init /usr/local/bin/step-awskms-init
+COPY --from=builder /src/bin/step-cloudkms-init /usr/local/bin/step-cloudkms-init
 
 USER root
 RUN apk add --no-cache libcap && setcap CAP_NET_BIND_SERVICE=+eip /usr/local/bin/step-ca

docker/Dockerfile.step-ca.hsm

@@ -0,0 +1,34 @@
+FROM golang:alpine AS builder
+
+WORKDIR /src
+COPY . .
+
+RUN apk add --no-cache curl git make
+RUN apk add --no-cache gcc musl-dev pkgconf pcsc-lite-dev
+RUN make V=1 GOFLAGS="" build
+
+
+FROM smallstep/step-cli:latest
+
+COPY --from=builder /src/bin/step-ca /usr/local/bin/step-ca
+COPY --from=builder /src/bin/step-awskms-init /usr/local/bin/step-awskms-init
+COPY --from=builder /src/bin/step-cloudkms-init /usr/local/bin/step-cloudkms-init
+COPY --from=builder /src/bin/step-pkcs11-init /usr/local/bin/step-pkcs11-init
+COPY --from=builder /src/bin/step-yubikey-init /usr/local/bin/step-yubikey-init
+
+USER root
+RUN apk add --no-cache libcap && setcap CAP_NET_BIND_SERVICE=+eip /usr/local/bin/step-ca
+RUN apk add --no-cache pcsc-lite pcsc-lite-libs
+USER step
+
+ENV CONFIGPATH="/home/step/config/ca.json"
+ENV PWDPATH="/home/step/secrets/password"
+
+VOLUME ["/home/step"]
+STOPSIGNAL SIGTERM
+HEALTHCHECK CMD step ca health 2>/dev/null | grep "^ok" >/dev/null
+
+COPY docker/entrypoint.sh /entrypoint.sh
+
+ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]
+CMD exec /usr/local/bin/step-ca --password-file $PWDPATH $CONFIGPATH

docker/entrypoint.sh

@@ -53,6 +53,10 @@ function step_ca_init () {
     mv $STEPPATH/password $PWDPATH
 }
 
+if [ -f /usr/sbin/pcscd ]; then
+	/usr/sbin/pcscd
+fi
+
 if [ ! -f "${STEPPATH}/config/ca.json" ]; then
 	init_if_possible
 fi