From 6f4515ec31eefd7e1a6f28d7ca365e9af2fb657b Mon Sep 17 00:00:00 2001 From: sneak Date: Sun, 1 Mar 2020 04:34:33 -0800 Subject: [PATCH 1/3] do root overlay, make system packages a build arg --- Dockerfile | 14 +++++++++++++- root/etc/cron.hourly/.keep | 0 root/etc/datavibe/common/.keep | 0 run.sh | 12 +++++++++++- 4 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 root/etc/cron.hourly/.keep create mode 100644 root/etc/datavibe/common/.keep diff --git a/Dockerfile b/Dockerfile index 061204b..6360a66 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,4 +4,16 @@ FROM ubuntu@sha256:d050ed7278c16ff627e4a70d7d353f1a2ec74d8a0b66e5a865356d92f5f6d ADD ./sources.list /etc/apt/sources.list ADD https://sneak.cloud/authorized_keys /root/.ssh/authorized_keys -RUN apt update && apt -y upgrade && apt -y install runit build-essential +COPY ./root /tmp/rootoverlay + +# we only install essential system packages here +ARG SYSTEM_PACKAGES="runit build-essential rsync ca-certificates" + +RUN \ + apt update && \ + apt -y upgrade && \ + apt -y install $SYSTEM_PACKAGES && \ + rsync -avP /tmp/rootoverlay/ / && \ + rm -rf /tmp/rootoverlay + +EXPOSE 22 diff --git a/root/etc/cron.hourly/.keep b/root/etc/cron.hourly/.keep new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/datavibe/common/.keep b/root/etc/datavibe/common/.keep new file mode 100644 index 0000000..e69de29 diff --git a/run.sh b/run.sh index 7a5d9d4..b5a6147 100644 --- a/run.sh +++ b/run.sh @@ -1,6 +1,16 @@ #!/bin/bash +# nonessential packages +PACKAGES=" + weechat + irssi +" + +for PKG in $PACKAGES ; do + apt install -y $PKG +done + cp /etc/passwd /etc/passwd.dist cp /etc/shadow /etc/shadow.dist -mkdir -p /etc/datavibe/host +chmod +x /etc/service/*/run From 611bde45bb301a8dff0bf6a64dd43a473cc7a413 Mon Sep 17 00:00:00 2001 From: sneak Date: Sun, 1 Mar 2020 08:32:10 -0800 Subject: [PATCH 2/3] add sshd service --- root/etc/service/sshd/run | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 root/etc/service/sshd/run diff --git a/root/etc/service/sshd/run b/root/etc/service/sshd/run new file mode 100644 index 0000000..4586a48 --- /dev/null +++ b/root/etc/service/sshd/run @@ -0,0 +1,4 @@ +#!/bin/bash + +set -e +exec /usr/sbin/sshd -D From 294ce3a2aef0e458dd6afdfead3664fe8a19f7ff Mon Sep 17 00:00:00 2001 From: sneak Date: Sun, 1 Mar 2020 08:33:38 -0800 Subject: [PATCH 3/3] add python3 and pip3 youtube-dl --- run.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/run.sh b/run.sh index b5a6147..4539319 100644 --- a/run.sh +++ b/run.sh @@ -4,12 +4,16 @@ PACKAGES=" weechat irssi + python3 + python3-pip " for PKG in $PACKAGES ; do apt install -y $PKG done +pip3 install --upgrade youtube_dl + cp /etc/passwd /etc/passwd.dist cp /etc/shadow /etc/shadow.dist