Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .github/workflows/release-canary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,6 @@ jobs:
sudo snap connect openshell:docker docker:docker-daemon
sudo snap connect openshell:log-observe
sudo snap connect openshell:system-observe
sudo snap connect openshell:ssh-keys

- name: Register snap gateway and check status
run: |
Expand Down
3 changes: 1 addition & 2 deletions docs/about/installation.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ typically `~/snap/openshell/common`. Gateway registrations live under
### Snap store installs

When installing from the Snap Store, snapd automatically connects the `home`,
`network`, `network-bind`, and `ssh-keys` plugs. The `docker` plug still
`network`, and `network-bind` plugs. The `docker` plug still
requires manual connection:

```shell
Expand All @@ -117,7 +117,6 @@ sudo snap install ./openshell_*.snap --dangerous
sudo snap connect openshell:home
sudo snap connect openshell:network
sudo snap connect openshell:network-bind
sudo snap connect openshell:ssh-keys
sudo snap connect openshell:docker docker:docker-daemon
sudo snap connect openshell:log-observe
sudo snap connect openshell:system-observe
Expand Down
15 changes: 11 additions & 4 deletions snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ description: |
sudo snap connect openshell:docker docker:docker-daemon
sudo snap connect openshell:log-observe
sudo snap connect openshell:system-observe
sudo snap connect openshell:ssh-keys
sudo snap start openshell.gateway

3. Verify the gateway and register it locally:
Expand Down Expand Up @@ -69,7 +68,6 @@ apps:
plugs:
- home
- network
- ssh-keys
- system-observe
term:
command: bin/openshell term
Expand All @@ -81,7 +79,6 @@ apps:
plugs:
- home
- network
- ssh-keys
- system-observe
gateway:
command: bin/openshell-gateway-wrapper
Expand All @@ -104,7 +101,6 @@ apps:
- log-observe
- network
- network-bind
- ssh-keys
- system-observe

parts:
Expand Down Expand Up @@ -150,3 +146,14 @@ parts:
"$CRAFT_PART_INSTALL/usr/share/doc/openshell/LICENSE"
install -D -m 0644 "$CRAFT_PART_SRC/README.md" \
"$CRAFT_PART_INSTALL/usr/share/doc/openshell/README.md"

ssh:
# Vendor the openssh-client `ssh` binary into the snap so the CLI/TUI
# can spawn `ssh` for sandbox connect/exec/forward without relying on
# the host's ssh-keys interface. The binary lands at
# $SNAP/usr/bin/ssh and is found via the snap runtime PATH.
plugin: nil
stage-packages:
- openssh-client
prime:
- usr/bin/ssh
Loading