Skip to content

Commit

Permalink
Explicitly install SSH
Browse files Browse the repository at this point in the history
Explicitly install the ssh client in all images. The 22.04 image was
missing it (likely due to --no-install-recommends). Also add an explict
test for it.
  • Loading branch information
JoshuaWatt committed Mar 21, 2024
1 parent c701b42 commit abdb290
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 0 deletions.
3 changes: 3 additions & 0 deletions ci/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -1175,6 +1175,9 @@ def test_bb_env_extra_parse(self):
def test_wine(self):
self.assertPyrexContainerCommand("wine --version")

def test_ssh(self):
self.assertPyrexContainerCommand("ssh -V")


class PyrexImageType_oegarmin(PyrexImageType_oe):
"""
Expand Down
10 changes: 10 additions & 0 deletions image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,8 @@ RUN set -x && export DEBIAN_FRONTEND=noninteractive && \
python-crypto \
python-six \
python3-six \
# Connectivity
ssh \
# An updated version of Git (from the PPA source above)
# that supports doing Yocto externalsrc recipes against free-
# standing working copies that use Git worktrees.
Expand Down Expand Up @@ -459,6 +461,8 @@ RUN set -x && export DEBIAN_FRONTEND=noninteractive && \
python-crypto \
python-six \
python3-six \
# Connectivity
ssh \
# An updated version of Git (from the PPA source above)
# that supports doing Yocto externalsrc recipes against free-
# standing working copies that use Git worktrees.
Expand Down Expand Up @@ -530,6 +534,8 @@ RUN set -x && export DEBIAN_FRONTEND=noninteractive && \
python-crypto \
python-six \
python3-six \
# Connectivity
ssh \
# Corollary to the core Yocto gcc-multilib package. Allows various
# prebuilt native tools to work
g++-multilib \
Expand Down Expand Up @@ -616,6 +622,8 @@ RUN set -x && export DEBIAN_FRONTEND=noninteractive && \
python-crypto \
python-six \
python3-six \
# Connectivity
ssh \
# Corollary to the core Yocto gcc-multilib package. Allows various
# prebuilt native tools to work
g++-multilib \
Expand Down Expand Up @@ -699,6 +707,8 @@ RUN set -x && export DEBIAN_FRONTEND=noninteractive && \
findutils \
# Required for some poorly written 3rd party recipes :(
python3-six \
# Connectivity
ssh \
# Corollary to the core Yocto gcc-multilib package. Allows various
# prebuilt native tools to work
g++-multilib \
Expand Down

0 comments on commit abdb290

Please sign in to comment.