Skip to content

Commit

Permalink
containers/ws: Drop cockpit-session
Browse files Browse the repository at this point in the history
`cockpit-session` isn't meant to work in the container: ws runs with
`--local-ssh` and everything happens via SSH, so we can just as well
drop it. This gets rid of the useless initial cockpit-session call for
the opportunistic "Negotiate" (Kerberos) authentication.

We temporarily also have to remove the program in
test/ws-container.install, until our Fedora 40 image gets a cockpit/ws
version which doesn't have it installed any more, i.e. when this commit
lands, gets released, published to quay.io, and into the fedora-40 image
rebuild.
  • Loading branch information
martinpitt committed Nov 20, 2024
1 parent d7cb561 commit 035dc2d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions containers/ws/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ else
dnf download cockpit-$rpm
unpack cockpit-$rpm-*.rpm
done
# do everything through SSH, no local authentication in the container
rm $INSTALLROOT/usr/libexec/cockpit-session
fi

rm -rf /build/var/cache/dnf /build/var/lib/dnf /build/var/lib/rpm* /build/var/log/*
Expand Down
2 changes: 2 additions & 0 deletions test/ws-container.install
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ podman run --name build-cockpit -i \
quay.io/cockpit/ws sh -exc '
cp -a /run/build/install/* /
cp /run/build/containers/ws/label-* /run/build/containers/ws/default-bastion.conf /run/build/containers/ws/cockpit-auth-ssh-key /container/
# done in containers/ws/install.sh; this can be removed once that change is in our VM images
rm -f /usr/libexec/cockpit-session
'
podman commit --change CMD=/container/label-run build-cockpit localhost/cockpit/ws
podman rm -f build-cockpit
Expand Down

0 comments on commit 035dc2d

Please sign in to comment.