diff --git a/src/files/Dockerfile b/src/files/Dockerfile index 544bdf8db..62b6db609 100644 --- a/src/files/Dockerfile +++ b/src/files/Dockerfile @@ -1,31 +1,2 @@ -FROM ubuntu:17.04 +FROM jkuri/abstruse -RUN rm /bin/sh && ln -s /bin/bash /bin/sh -RUN echo 'export PS1="> "' > /root/.bashrc -RUN apt-get update && apt-get install -y curl apt-transport-https wget rsync apt-utils -RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - -RUN sh -c 'echo "deb https://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' -RUN apt-get update -RUN apt-get install -y build-essential ca-certificates git libssl-dev python xvfb fluxbox google-chrome-stable firefox sudo - -RUN export CHROME_BIN=google-chrome-stable -COPY xvfb /etc/init.d/xvfb -RUN chmod a+x /etc/init.d/xvfb - -RUN useradd -m abstruse -RUN usermod -aG sudo abstruse -RUN echo 'export PS1="> "' >> /home/abstruse/.bashrc -RUN echo '. /home/abstruse/.nvm/nvm.sh' >> /home/abstruse/.bashrc -RUN echo "abstruse ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers - -USER abstruse -RUN mkdir /home/abstruse/build -WORKDIR /home/abstruse/build - -RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.2/install.sh | bash \ - && export NVM_DIR="$HOME/.nvm" \ - && [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" \ - && source $NVM_DIR/nvm.sh \ - && nvm install node - -EXPOSE 22 5900 5800 diff --git a/src/files/xvfb b/src/files/xvfb deleted file mode 100644 index a92acee07..000000000 --- a/src/files/xvfb +++ /dev/null @@ -1,34 +0,0 @@ -### BEGIN INIT INFO -# Provides: Xvfb -# Required-Start: $local_fs $remote_fs -# Required-Stop: -# X-Start-Before: -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Loads X Virtual Frame Buffer -### END INIT INFO - -XVFB=/usr/bin/Xvfb -XVFBARGS=":99 -screen 0 1024x768x24 -ac +extension GLX +render -noreset" -PIDFILE=/var/run/xvfb.pid -case "$1" in - start) - echo -n "Starting virtual X frame buffer: Xvfb" - start-stop-daemon --start --quiet --pidfile $PIDFILE --make-pidfile --background --exec $XVFB -- $XVFBARGS - echo "." - ;; - stop) - echo -n "Stopping virtual X frame buffer: Xvfb" - start-stop-daemon --stop --quiet --pidfile $PIDFILE - echo "." - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "Usage: /etc/init.d/xvfb {start|stop|restart}" - exit 1 -esac - -exit 0