Change debian-ssh repository to fit our workshop

Author: nkania

Dockerfile

@@ -1,29 +1,13 @@
-FROM debian:latest
-#
-#
-#
-MAINTAINER "Kirill Müller" <krlmlr+docker@mailbox.org>
+FROM debian:stretch
 
-# Install packages
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install openssh-server sudo
-ADD set_root_pw.sh /set_root_pw.sh
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install openssh-server
 ADD run.sh /run.sh
 RUN chmod +x /*.sh
-RUN mkdir -p /var/run/sshd && sed -i "s/UsePrivilegeSeparation.*/UsePrivilegeSeparation no/g" /etc/ssh/sshd_config \
-  && sed -i 's/PermitRootLogin without-password/PermitRootLogin yes/' /etc/ssh/sshd_config \
+RUN mkdir -p /var/run/sshd \
+  && sed -i 's/#PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config \
   && touch /root/.Xauthority \
   && true
-
-## Set a default user. Available via runtime flag `--user docker`
-## Add user to 'staff' group, granting them write privileges to /usr/local/lib/R/site.library
-## User should also have & own a home directory, but also be able to sudo
-RUN useradd docker \
-        && passwd -d docker \
-        && mkdir /home/docker \
-        && chown docker:docker /home/docker \
-        && addgroup docker staff \
-        && addgroup docker sudo \
-        && true
+RUN echo "root:root" | chpasswd
 
 EXPOSE 22
 CMD ["/run.sh"]

LICENSE

@@ -1,44 +1,3 @@
-all: test
-
-PARENT_NAME=$(shell sed -r -n '/^FROM/ {s/^FROM +//;p}' Dockerfile)
-PROJECT=debian-ssh
-CONTAINER_NAME=$(PROJECT):$(shell git rev-parse --abbrev-ref HEAD | sed 's/master/latest/')
-PORT=2222
-DOCKER_USER=docker
-
-distribute: .FORCE
-	for b in $$(git branch --no-merged); do git merge-into $$b --no-edit; done
-
-killall: .FORCE
-	docker kill $$(docker ps | sed -r -n '/^[^ ]+ +$(CONTAINER_NAME) / {s/ .*$$//;p}')
-
-pull: .FORCE
-	docker pull $(PARENT_NAME)
-
-build: .FORCE
-	docker build -t $(CONTAINER_NAME) .
-
-rebuild: pull .FORCE
-	docker build --no-cache -t $(CONTAINER_NAME) .
-
-test: build .FORCE
-	docker run -d -p $(PORT):22 -e SSH_KEY="$$(cat ~/.ssh/id_rsa.pub)" $(CONTAINER_NAME)
-	while ! ssh $(DOCKER_USER)@localhost -p $(PORT) -o "StrictHostKeyChecking=no" env; do sleep 0.1; done
-	docker kill $$(docker ps -ql)
-
-debug-ssh: build .FORCE
-	docker run -p $(PORT):22 -e SSH_KEY="$$(cat ~/.ssh/id_rsa.pub)" $(CONTAINER_NAME)
-
-debug-connect: .FORCE
-	ssh $(DOCKER_USER)@localhost -p $(PORT) -o "StrictHostKeyChecking=no" env
-
-debug-connect-root: .FORCE
-	ssh root@localhost -p $(PORT) -o "StrictHostKeyChecking=no" env
-
-debug-bash: build .FORCE
-	docker run -ti -u $(DOCKER_USER) $(CONTAINER_NAME) bash
-
-debug-bash-root: build .FORCE
-	docker run -ti $(CONTAINER_NAME) bash
-
-.FORCE:
+run:
+	docker build -t debian-ssh .
+	docker run -d -p 2222:22 debian-ssh