diff --git a/.drone.yml b/.drone.yml index ca58e25..fbf9aae 100644 --- a/.drone.yml +++ b/.drone.yml @@ -30,6 +30,11 @@ services: volumes: - name: dockersock path: /var/run + command: + - dockerd-entrypoint.sh + - dockerd + - --host=unix:///var/run/docker.sock + - --mtu=1492 volumes: - name: dockersock @@ -68,6 +73,11 @@ services: volumes: - name: dockersock path: /var/run + command: + - dockerd-entrypoint.sh + - dockerd + - --host=unix:///var/run/docker.sock + - --mtu=1492 volumes: - name: dockersock diff --git a/Dockerfile b/Dockerfile index efd31b1..9d66449 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,23 @@ -FROM debian:bookworm-slim +FROM debian:trixie-slim RUN set -eux && \ apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ openssh-server \ + sudo \ locales \ curl \ telnet \ net-tools \ screen \ vim \ + git \ + man \ + less \ + bind9-dnsutils \ + unzip \ + rsync \ && \ rm -rf /var/lib/apt/lists/* && \ rm /etc/ssh/ssh_host_*key* && \ diff --git a/README.md b/README.md index 0d571bb..fb62521 100644 --- a/README.md +++ b/README.md @@ -26,10 +26,10 @@ $ docker run -it \ --name jumpbox \ -v $(pwd)/jumpbox:/var/lib/jumpbox \ - -e "ROOT_AUTHORIZED_KEYS=/var/lib/jumpbox/authorized_keys" - -e "HOSTKEYS=/var/lib/jumpbox/ssh_host_ed25519_key;/var/lib/jumpbox/ssh_host_rsa_key" - -e "USERADD=jumpbox:1000:1000:/bin/bash" - -e "GROUPADD=jumpbox:1000" + -e "ROOT_AUTHORIZED_KEYS=/var/lib/jumpbox/authorized_keys" \ + -e "HOSTKEYS=/var/lib/jumpbox/ssh_host_ed25519_key;/var/lib/jumpbox/ssh_host_rsa_key" \ + -e "USERADD=jumpbox:1000:1000:/bin/bash" \ + -e "GROUPADD=jumpbox:1000" \ -p 1022:22 \ pommib/jumpbox:latest ``` @@ -53,3 +53,18 @@ services: USERADD: jumpbox:1000:1000:/bin/bash GROUPADD: jumpbox:1000 ``` + +## Login as root + +``` +$ ssh -l root 127.0.0.1 -p 1022 +``` + +## Login as jumpbox + +To login as user jumpbox, make sure `/home/jumpbox` is a mounted volume +containing `.ssh/authorized_keys` containing your public key. + +``` +$ ssh -l jumpbox 127.0.0.1 -p 1022 +``` diff --git a/rebuild.sh b/rebuild.sh index d2f5dea..748bfe6 100755 --- a/rebuild.sh +++ b/rebuild.sh @@ -1,8 +1,10 @@ #!/bin/sh +set -x + updates_available () { docker pull "$1" - if test "$(docker run -it --rm "$1" /bin/sh -c 'apt -qqq update && apt -qq list --upgradable')" != ""; then + if test "$(docker run --rm "$1" /bin/sh -c 'apt -qqq update && apt -qq list --upgradable')" != ""; then return 0 else return 1 diff --git a/setup.sh b/setup.sh index 8076088..f909624 100755 --- a/setup.sh +++ b/setup.sh @@ -46,6 +46,7 @@ while [ "$USERADD" != "$i" ] ;do USER_SHELL=$j useradd --home-dir "$BASE_DIR/$USER_NAME" --shell "$USER_SHELL" --uid "$USER_UID" --gid "$USER_GID" "$USER_NAME" + echo "$USER_NAME ALL=(ALL) NOPASSWD:ALL" > "/etc/sudoers.d/$USER_NAME" done # HOSTKEYS="/var/lib/jumpbox/ssh_host_ed25519_key;/var/lib/jumpbox/ssh_host_rsa_key"