Skip to content

Update spiffe-step-ssh #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 4, 2025
Merged

Update spiffe-step-ssh #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7673bc5
Update spiffe-step-ssh
kfox1111 Aug 4, 2025
95649a5
Add missing dep
kfox1111 Aug 4, 2025
c5eb296
Fix var
kfox1111 Aug 4, 2025
ece44a9
Fix var
kfox1111 Aug 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions examples/rpms/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
ARG STEPVER="0.28.2"
ARG STEPCAVER="0.28.4"

FROM docker.io/library/almalinux:9 AS rpm-builder
ARG STEPVER
ARG STEPCAVER

WORKDIR /tmp

Expand Down Expand Up @@ -49,10 +51,12 @@ RUN --mount=type=secret,id=gpg \

RUN \
dnf localinstall -y https://github.com/smallstep/cli/releases/download/v${STEPVER}/step-cli-${STEPVER}-1.$(uname -i).rpm && \
dnf localinstall -y https://github.com/smallstep/certificates/releases/download/v${STEPCAVER}/step-ca-${STEPCAVER}-1.$(uname -i).rpm && \
dnf localinstall -y /root/rpmbuild/RPMS/*/*.rpm

FROM docker.io/library/ubuntu:latest AS deb-builder
ARG STEPVER
ARG STEPCAVER

COPY --from=rpm-builder /root/rpmbuild/RPMS /root/rpmbuild/RPMS

Expand All @@ -69,7 +73,9 @@ RUN \

RUN \
curl -L -o step-cli.deb https://github.com/smallstep/cli/releases/download/v${STEPVER}/step-cli_${STEPVER}-1_$(dpkg --print-architecture).deb && \
curl -L -o step-ca.deb https://github.com/smallstep/certificates/releases/download/v${STEPCAVER}/step-ca_${STEPCAVER}-1_$(dpkg --print-architecture).deb && \
apt-get install -y ./step-cli.deb && \
apt-get install -y ./step-ca.deb && \
apt-get install -y /root/debbuild/*/*.deb

FROM docker.io/library/nginx:latest
Expand Down
22 changes: 20 additions & 2 deletions examples/rpms/spiffe-step-ssh.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

Summary: SPIFFE Step SSH
Name: spiffe-step-ssh
Version: 0.0.6
Release: 2
Version: 0.0.7
Release: 1
Group: Applications/Internet
License: Apache-2.0
URL: https://spiffe.io
Expand All @@ -35,6 +35,13 @@ Requires: spiffe-helper
%description
SPIFFE Step SSH

%package -n spiffe-step-ssh-server
Summary: SPIFFE Step SSH Server
Requires: step-ca
Requires: spiffe-helper
%description -n spiffe-step-ssh-server
SPIFFE Step SSH Server

%global _missing_build_ids_terminate_build 0
%global debug_package %{nil}

Expand All @@ -47,6 +54,7 @@ SPIFFE Step SSH
%install
cd spiffe-step-ssh-%{version}
make install DESTDIR="%{buildroot}"
make install-server DESTDIR="%{buildroot}"

%clean
rm -rf %{buildroot}
Expand All @@ -57,3 +65,13 @@ rm -rf %{buildroot}
/usr/lib/systemd/system/[email protected]
/usr/lib/systemd/system/spiffe-step-ssh-cleanup.service
%config(noreplace) /etc/spiffe/step-ssh

%files -n spiffe-step-ssh-server
/usr/lib/systemd/system/[email protected]
/usr/lib/systemd/system/[email protected]
/usr/libexec/spiffe/step-ssh-server/main
/usr/libexec/spiffe/step-ssh-server/ssh_x5c.tpl
/usr/libexec/spiffe/step-ssh-server/nginx-fetchca.conf
/usr/libexec/spiffe/step-ssh-server/helper-fetchca.conf
/usr/sbin/setup-spiffe-step-ssh-server
%config(noreplace) /etc/spiffe/step-ssh-server