jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

udpates to ci dockerfiles

Browse Source
This commit is contained in:
Albert Yi
2018-06-25 16:06:39 -07:00
parent 9c148fada4
commit 2d8fcf820e
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/docker/danbooru-base
View File

@@ -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 \ 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 \ && tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
&& rm 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 apt-get clean
# need to install 8.6 for smartcrop # need to install 8.6 for smartcrop
RUN cd /tmp && \ RUN cd /tmp && \
@@ -15,6 +15,7 @@ RUN cd /tmp && \
cd vips-8.6.4 && \ cd vips-8.6.4 && \
./configure && \ ./configure && \
make install && \ make install && \
ldconfig && \
cd /tmp && \ cd /tmp && \
rm -rf vips-8.6.4 rm -rf vips-8.6.4
RUN useradd -ms /bin/bash danbooru -u 1000 RUN useradd -ms /bin/bash danbooru -u 1000

2
config/docker/danbooru-ci
View File

@@ -2,6 +2,8 @@
FROM r888888888/danbooru-base FROM r888888888/danbooru-base
ENV PATH $PATH:/usr/local/bin
USER root USER root
COPY . /app COPY . /app
RUN chown -R danbooru:danbooru . RUN chown -R danbooru:danbooru .