Skip to content

Commit

Permalink
Merge pull request #1753 from jo-lund/remove-docker-ssh
Browse files Browse the repository at this point in the history
chore: Remove ssh configuration from the docker test container
  • Loading branch information
jo-lund authored Feb 6, 2025
2 parents 2793527 + dab59a0 commit 9749b0e
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 10 deletions.
10 changes: 1 addition & 9 deletions tests/Dockerfile.daemon
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,7 @@ RUN mender-artifact write bootstrap-artifact \
FROM ubuntu:22.04

RUN mkdir -p /run/dbus
RUN apt update && apt install -y openssh-server libboost-log1.74.0 liblmdb0 libarchive13 dbus iproute2

# Set no password
RUN sed -ie 's/^root:[^:]*:/root::/' /etc/shadow
RUN sed -ie 's/^UsePAM/#UsePam/' /etc/ssh/sshd_config
RUN echo 'PermitEmptyPasswords yes\n\
PermitRootLogin yes\n\
Port 22\n\
Port 8822\n' >> /etc/ssh/sshd_config
RUN apt update && apt install -y libboost-log1.74.0 liblmdb0 libarchive13 dbus iproute2

COPY --from=build /mender-install/usr/bin/mender-update /usr/bin/mender-update
COPY --from=build /mender-install/usr/bin/mender-auth /usr/bin/mender-auth
Expand Down
1 change: 0 additions & 1 deletion tests/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ if [ -n "$TENANT_TOKEN" ]; then
sed -i -e "s/\"TenantToken\": *\"[^\"]*\"/\"TenantToken\": \"$TENANT_TOKEN\"/" /etc/mender/mender.conf
fi

/etc/init.d/ssh start
cp /usr/share/dbus-1/system.d/io.mender.AuthenticationManager.conf /etc/dbus-1/system-local.conf
dbus-daemon --nofork --nopidfile --system &
sleep 8
Expand Down

0 comments on commit 9749b0e

Please sign in to comment.