diff --git a/config/docker/danbooru-base b/config/docker/danbooru-base index a0c513b8d..0374a519a 100644 --- a/config/docker/danbooru-base +++ b/config/docker/danbooru-base @@ -6,7 +6,7 @@ RUN apt-get -y install wget RUN wget -q https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \ && tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \ && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz -RUN apt-get -y install -qq apt-utils build-essential automake libssl-dev libxml2-dev libxslt-dev ncurses-dev sudo libreadline-dev flex bison ragel memcached libmemcached-dev git curl libcurl4-openssl-dev imagemagick libmagickcore-dev libmagickwand-dev sendmail-bin sendmail postgresql-client libpq-dev nginx ssh coreutils ffmpeg mkvtoolnix emacs24-nox telnet libvips42 libvips-tools libvips-dev && \ +RUN apt-get -y install -qq apt-utils build-essential automake libssl-dev libxml2-dev libxslt-dev ncurses-dev sudo libreadline-dev flex bison ragel memcached libmemcached-dev git curl libcurl4-openssl-dev imagemagick libmagickcore-dev libmagickwand-dev sendmail-bin sendmail postgresql-client libpq-dev nginx ssh coreutils ffmpeg mkvtoolnix emacs24-nox telnet && \ apt-get clean # need to install 8.6 for smartcrop RUN cd /tmp && \ @@ -15,6 +15,7 @@ RUN cd /tmp && \ cd vips-8.6.4 && \ ./configure && \ make install && \ + ldconfig && \ cd /tmp && \ rm -rf vips-8.6.4 RUN useradd -ms /bin/bash danbooru -u 1000 diff --git a/config/docker/danbooru-ci b/config/docker/danbooru-ci index 9b837e182..ef1fba91a 100644 --- a/config/docker/danbooru-ci +++ b/config/docker/danbooru-ci @@ -2,6 +2,8 @@ FROM r888888888/danbooru-base +ENV PATH $PATH:/usr/local/bin + USER root COPY . /app RUN chown -R danbooru:danbooru .