Compare commits

..

No commits in common. "main" and "v3" have entirely different histories.
main ... v3

4 changed files with 2 additions and 40 deletions

View file

@ -2,8 +2,7 @@ FROM alpine:3.22
RUN apk update && apk upgrade && apk add --no-cache \ RUN apk update && apk upgrade && apk add --no-cache \
git \ git \
docker-cli \ docker \
docker-cli-compose \
bash \ bash \
fish \ fish \
zsh \ zsh \
@ -30,15 +29,9 @@ COPY service.ssh.sh /app/
COPY service.ttyd.sh /app/ COPY service.ttyd.sh /app/
RUN chmod +x /app/entrypoint.sh /app/service.ssh.sh /app/service.ttyd.sh RUN chmod +x /app/entrypoint.sh /app/service.ssh.sh /app/service.ttyd.sh
COPY motd.txt /etc/motd
RUN mkdir -p /srv/stack RUN mkdir -p /srv/stack
WORKDIR /srv/stack WORKDIR /srv/stack
# Set environment variable for Docker Compose project name
# This is needed because inside ttyd docker compose defaults to hostname + directory for the project name
ENV COMPOSE_PROJECT_NAME=stack
EXPOSE 22 1234 EXPOSE 22 1234
ENTRYPOINT ["/app/entrypoint.sh"] ENTRYPOINT ["/app/entrypoint.sh"]

View file

@ -22,22 +22,6 @@ if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
ssh-keygen -A ssh-keygen -A
fi fi
if [ -f /etc/ssh/sshd_config -a `cat /etc/ssh/sshd_config | wc -l` = 1 ]; then
echo "sshd_config is not complete, regenerating..."
rm -f /etc/ssh/sshd_config
fi
if [ ! -f /etc/ssh/sshd_config ]; then
echo "Include /etc/ssh/sshd_config.d/*.conf" > /etc/ssh/sshd_config
echo "PermitRootLogin yes" >> /etc/ssh/sshd_config
echo "AuthorizedKeysFile .ssh/authorized_keys" >> /etc/ssh/sshd_config
echo "PasswordAuthentication yes" >> /etc/ssh/sshd_config
echo "AllowTcpForwarding no" >> /etc/ssh/sshd_config
echo "GatewayPorts no" >> /etc/ssh/sshd_config
echo "X11Forwarding no" >> /etc/ssh/sshd_config
echo "Subsystem sftp internal-sftp" >> /etc/ssh/sshd_config
fi
# Array to store child PIDs # Array to store child PIDs
declare -a CHILD_PIDS=() declare -a CHILD_PIDS=()

View file

View file

@ -1,18 +1,3 @@
#!/bin/sh #!/bin/sh
if [ ! -e /etc/ssh/sshd_config ]; then exec /usr/sbin/sshd -D
mkdir -p /etc/ssh/sshd_config.d
echo "Include /etc/ssh/sshd_config.d/*.conf
PermitRootLogin yes
AuthorizedKeysFile .ssh/authorized_keys
PasswordAuthentication yes
AllowTcpForwarding yes
GatewayPorts no
X11Forwarding no
Subsystem sftp internal-sftp" > /etc/ssh/sshd_config
fi
# Cloud image generates this file which prevents sshd from accepting passwords
rm -f /etc/ssh/sshd_config.d/50-cloud-init.conf
exec /usr/sbin/sshd -E /var/log/sshd.log -D