From 33b9176fae5aff4554468abd372285cd74677734 Mon Sep 17 00:00:00 2001 From: Sebastian Rakel Date: Mon, 31 Oct 2016 09:18:38 +0100 Subject: Move Dockercontainer base from ubuntu:14.04 to alpine:edge --- docker/Dockerfile | 46 ---------------------------------------------- docker/docker-compose.yml | 2 +- 2 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 docker/Dockerfile (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile deleted file mode 100644 index 8dd4e4e09..000000000 --- a/docker/Dockerfile +++ /dev/null @@ -1,46 +0,0 @@ -FROM ubuntu:14.04 -MAINTAINER Sebastian Rakel - -ENV DEBIAN_FRONTEND noninteractive - -RUN apt-get update -y && \ - apt-get install -y php5 php5-mysql php5-gd php5-imagick expect \ - python-pygments imagemagick git python-pip realpath curl apt-transport-https - -RUN echo 'deb https://deb.nodesource.com/node_4.x trusty main' > /etc/apt/sources.list.d/nodesource.list -RUN echo 'deb-src https://deb.nodesource.com/node_4.x trusty main' >> /etc/apt/sources.list.d/nodesource.list - -RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - - -RUN apt-get update -y && \ - apt-get install -y nodejs - -RUN sudo pip install ansi2html - -ENV FILEBIN_HOME_DIR /var/lib/filebin -ENV FILEBIN_DIR $FILEBIN_HOME_DIR/filebin - -RUN useradd -m -g users -d $FILEBIN_HOME_DIR filebin - -USER filebin - -ADD filebin_starter.sh $FILEBIN_HOME_DIR -ADD add_user.sh $FILEBIN_HOME_DIR - -RUN git clone https://git.server-speed.net/users/flo/filebin/ $FILEBIN_DIR - -WORKDIR $FILEBIN_DIR - -RUN cp ./application/config/example/* ./application/config/ -RUN rm ./application/config/config-local.php - -RUN php ./install.php - -WORKDIR $FILEBIN_HOME_DIR - -EXPOSE 8080 - -VOLUME ["$FILEBIN_DIR/application/config", "$FILEBIN_DIR/data/uploads"] - -ENTRYPOINT ["bash", "-c"] -CMD ["./filebin_starter.sh"] diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 72efba67c..03bc37f59 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -12,7 +12,7 @@ services: filebin: links: - mysql - build: . + build: .. ports: - "8080:8080" environment: -- cgit v1.2.3-24-g4f1b