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

Merge pull request #1299 from smallstep/docker-hsm-glibc

Browse source 
Update Dockerfile.hsm to use debian:bullseye base image
This commit is contained in:
Max 2023-04-12 14:32:11 -07:00 committed by GitHub
commit 5ec9e761ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.github/workflows/release.yml vendored
View file

@ -17,7 +17,6 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
env: env:
DOCKER_IMAGE: smallstep/step-ca DOCKER_IMAGE: smallstep/step-ca
DOCKER_IMAGE_HSM: smallstep/step-ca-hsm
outputs: outputs:
version: ${{ steps.extract-tag.outputs.VERSION }} version: ${{ steps.extract-tag.outputs.VERSION }}
is_prerelease: ${{ steps.is_prerelease.outputs.IS_PRERELEASE }} is_prerelease: ${{ steps.is_prerelease.outputs.IS_PRERELEASE }}
@ -38,12 +37,12 @@ jobs:
VERSION=${GITHUB_REF#refs/tags/v} VERSION=${GITHUB_REF#refs/tags/v}
echo "VERSION=${VERSION}" >> ${GITHUB_OUTPUT} echo "VERSION=${VERSION}" >> ${GITHUB_OUTPUT}
echo "DOCKER_TAGS=${{ env.DOCKER_IMAGE }}:${VERSION}" >> ${GITHUB_ENV} echo "DOCKER_TAGS=${{ env.DOCKER_IMAGE }}:${VERSION}" >> ${GITHUB_ENV}
echo "DOCKER_TAGS_HSM=${{ env.DOCKER_IMAGE_HSM }}:${VERSION}" >> ${GITHUB_ENV} echo "DOCKER_TAGS_HSM=${{ env.DOCKER_IMAGE }}:${VERSION}-hsm" >> ${GITHUB_ENV}
- name: Add Latest Tag - name: Add Latest Tag
if: steps.is_prerelease.outputs.IS_PRERELEASE == 'false' if: steps.is_prerelease.outputs.IS_PRERELEASE == 'false'
run: | run: |
echo "DOCKER_TAGS=${{ env.DOCKER_TAGS }},${{ env.DOCKER_IMAGE }}:latest" >> ${GITHUB_ENV} echo "DOCKER_TAGS=${{ env.DOCKER_TAGS }},${{ env.DOCKER_IMAGE }}:latest" >> ${GITHUB_ENV}
echo "DOCKER_TAGS_HSM=${{ env.DOCKER_TAGS_HSM }},${{ env.DOCKER_IMAGE_HSM }}:latest" >> ${GITHUB_ENV} echo "DOCKER_TAGS_HSM=${{ env.DOCKER_TAGS_HSM }},${{ env.DOCKER_IMAGE }}:hsm" >> ${GITHUB_ENV}
- name: Create Release - name: Create Release
id: create_release id: create_release
uses: actions/create-release@v1 uses: actions/create-release@v1

8
docker/Dockerfile
View file

@ -3,19 +3,17 @@ FROM golang:alpine AS builder
WORKDIR /src WORKDIR /src
COPY . . COPY . .
RUN apk add --no-cache curl git make RUN apk add --no-cache curl git make libcap
RUN make V=1 download
RUN make V=1 bin/step-ca RUN make V=1 bin/step-ca
RUN setcap CAP_NET_BIND_SERVICE=+eip bin/step-ca
FROM smallstep/step-kms-plugin-cloud:latest AS kms FROM smallstep/step-kms-plugin:cloud AS kms
FROM smallstep/step-cli:latest FROM smallstep/step-cli:latest
COPY --from=builder /src/bin/step-ca /usr/local/bin/step-ca COPY --from=builder /src/bin/step-ca /usr/local/bin/step-ca
COPY --from=kms /usr/local/bin/step-kms-plugin /usr/local/bin/step-kms-plugin COPY --from=kms /usr/local/bin/step-kms-plugin /usr/local/bin/step-kms-plugin
USER root
RUN apk add --no-cache libcap && setcap CAP_NET_BIND_SERVICE=+eip /usr/local/bin/step-ca
USER step USER step
ENV CONFIGPATH="/home/step/config/ca.json" ENV CONFIGPATH="/home/step/config/ca.json"

19
docker/Dockerfile.hsm
View file

@ -1,23 +1,24 @@
FROM golang:alpine AS builder FROM golang AS builder
WORKDIR /src WORKDIR /src
COPY . . COPY . .
RUN apk add --no-cache curl git make RUN apt-get update
RUN apk add --no-cache gcc musl-dev pkgconf pcsc-lite-dev RUN apt-get install -y --no-install-recommends \
RUN make V=1 download gcc pkgconf libpcsclite-dev libcap2-bin
RUN make V=1 GOFLAGS="" build RUN make V=1 GOFLAGS="" bin/step-ca
RUN setcap CAP_NET_BIND_SERVICE=+eip bin/step-ca
FROM smallstep/step-kms-plugin:latest AS kms FROM smallstep/step-kms-plugin:bullseye AS kms
FROM smallstep/step-cli:latest FROM smallstep/step-cli:bullseye
COPY --from=builder /src/bin/step-ca /usr/local/bin/step-ca COPY --from=builder /src/bin/step-ca /usr/local/bin/step-ca
COPY --from=kms /usr/local/bin/step-kms-plugin /usr/local/bin/step-kms-plugin COPY --from=kms /usr/local/bin/step-kms-plugin /usr/local/bin/step-kms-plugin
USER root USER root
RUN apk add --no-cache libcap && setcap CAP_NET_BIND_SERVICE=+eip /usr/local/bin/step-ca RUN apt-get update
RUN apk add --no-cache pcsc-lite pcsc-lite-libs RUN apt-get install -y --no-install-recommends pcscd libpcsclite1
RUN mkdir -p /run/pcscd RUN mkdir -p /run/pcscd
RUN chown step:step /run/pcscd RUN chown step:step /run/pcscd
USER step USER step