Commit 7ea87c2f authored by Joseph Weston's avatar Joseph Weston
Browse files

remove syncthing

parent 9b58b2f2
......@@ -29,7 +29,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing \
zsh \
openssh-server \
apt-transport-https \
supervisor \
gnupg \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
......@@ -73,17 +72,6 @@ ENV OPENBLAS_NUM_THREADS=1\
MKL_NUM_THREADS=1\
CONDA_ALWAYS_COPY=true
# Syncthing installation
RUN curl -s https://syncthing.net/release-key.txt | apt-key add - && \
echo "deb https://apt.syncthing.net/ syncthing stable" | tee /etc/apt/sources.list.d/syncthing.list && \
apt-get update && apt-get install -y syncthing && apt-get clean
# https://docs.syncthing.net/users/faq.html#how-do-i-increase-the-inotify-limit-to-get-my-filesystem-watcher-to-work
RUN echo "fs.inotify.max_user_watches=204800" | sudo tee -a /etc/sysctl.conf
# Install supervisor for automatic starting of syncthing
COPY supervisord.conf /etc/supervisor/supervisord.conf
# Fix permissions (required when following the base image)
RUN fix-permissions /opt/conda
......
......@@ -16,9 +16,6 @@ conda config --system --add pkgs_dirs /home/$NB_USER/.conda/pkgs
mkdir -p /var/run/sshd
/usr/sbin/sshd
## launch daemonized supervisor
/usr/bin/supervisord
## start the notebook server, passing in all the environment variables
## we run as NB_USER to prevent 'start.sh' from doing its job twice
exec su $NB_USER -p -c "env PATH=$PATH HOME=/home/$NB_USER /usr/local/bin/start-singleuser.sh $*"
[supervisord]
logfile = /tmp/supervisord.log
pidfile = /tmp/supervisord.pid
[program:syncthing]
command = /usr/bin/syncthing -no-browser -home="/home/%(ENV_NB_USER)s/.config/syncthing"
directory = /home/%(ENV_NB_USER)s/
autorestart = True
user = %(ENV_NB_USER)s
environment = STNORESTART="1", HOME="/home/%(ENV_NB_USER)s"
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment