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

update dockerfiles

Browse Source
This commit is contained in:
Albert Yi
2018-06-25 16:30:53 -07:00
parent 2d8fcf820e
commit f4d5932a66
3 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
config/docker/danbooru-base
View File

@@ -1,37 +1,39 @@
FROM ruby:2.5.1-slim-stretch FROM ruby:2.5.1-slim-stretch
RUN apt-get update
ENV DOCKERIZE_VERSION v0.6.1 ENV DOCKERIZE_VERSION v0.6.1
RUN apt-get -y install wget ENV VIPS_VERSION 8.6.4
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 \ RUN apt-get update && \
&& rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz apt-get -y install wget && \
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 && \ wget -q https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && \
apt-get clean tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && \
# need to install 8.6 for smartcrop rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && \
RUN cd /tmp && \ 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 && \
wget -q https://github.com/jcupitt/libvips/releases/download/v8.6.4/vips-8.6.4.tar.gz && \ apt-get clean && \
tar xzf vips-8.6.4.tar.gz && \ cd /tmp && \
cd vips-8.6.4 && \ wget -q https://github.com/jcupitt/libvips/releases/download/v$VIPS_VERSION/vips-$VIPS_VERSION.tar.gz && \
./configure && \ tar xzf vips-$VIPS_VERSION.tar.gz && \
cd vips-$VIPS_VERSION && \
./configure --prefix=/usr && \
make install && \ make install && \
ldconfig && \ ldconfig && \
cd /tmp && \ cd /tmp && \
rm -rf vips-8.6.4 rm -rf vips-$VIPS_VERSION && \
RUN useradd -ms /bin/bash danbooru -u 1000 useradd -ms /bin/bash danbooru -u 1000 && \
RUN mkdir /app mkdir /app && \
RUN mkdir -p /var/www/danbooru/shared/data mkdir -p /var/www/danbooru/shared/data && \
RUN mkdir -p /var/www/danbooru/shared/data/preview mkdir -p /var/www/danbooru/shared/data/preview && \
RUN mkdir -p /var/www/danbooru/shared/data/sample mkdir -p /var/www/danbooru/shared/data/crop && \
mkdir -p /var/www/danbooru/shared/data/sample
COPY . /app COPY . /app
RUN chown -R danbooru:danbooru /app RUN chown -R danbooru:danbooru /app && \
RUN chown -R danbooru:danbooru /var/www/danbooru chown -R danbooru:danbooru /var/www/danbooru && \
RUN mkdir /var/run/danbooru mkdir /var/run/danbooru && \
RUN chown danbooru:danbooru /var/run/danbooru chown danbooru:danbooru /var/run/danbooru
EXPOSE 3000 EXPOSE 3000
USER danbooru USER danbooru
RUN echo 'gem: --no-document' > ~/.gemrc RUN echo 'gem: --no-document' > ~/.gemrc && \
RUN gem install bundler --quiet gem install bundler --quiet
WORKDIR /app WORKDIR /app
RUN bundle install RUN bundle install
COPY script/install/database.yml.templ /app/config/database.yml COPY script/install/database.yml.templ /app/config/database.yml

2
config/docker/danbooru-ci
View File

@@ -6,7 +6,7 @@ ENV PATH $PATH:/usr/local/bin
USER root USER root
COPY . /app COPY . /app
RUN chown -R danbooru:danbooru . RUN chown -R danbooru:danbooru public/ tmp/ config/ log/ db/
# install circleci cli tools # install circleci cli tools
RUN curl -q -o /usr/local/bin/circleci https://circle-downloads.s3.amazonaws.com/releases/build_agent_wrapper/circleci RUN curl -q -o /usr/local/bin/circleci https://circle-downloads.s3.amazonaws.com/releases/build_agent_wrapper/circleci

6
test/unit/post_test.rb
View File

@@ -2651,9 +2651,9 @@ class PostTest < ActiveSupport::TestCase
should "generate the correct urls for animated gifs" do should "generate the correct urls for animated gifs" do
@post = FactoryBot.build(:post, md5: "deadbeef", file_ext: "gif", tag_string: "animated_gif") @post = FactoryBot.build(:post, md5: "deadbeef", file_ext: "gif", tag_string: "animated_gif")
assert_equal("http://#{Socket.gethostname}/data/preview/deadbeef.jpg", @post.preview_file_url) assert_equal("https://#{Socket.gethostname}/data/preview/deadbeef.jpg", @post.preview_file_url)
assert_equal("http://#{Socket.gethostname}/data/deadbeef.gif", @post.large_file_url) assert_equal("https://#{Socket.gethostname}/data/deadbeef.gif", @post.large_file_url)
assert_equal("http://#{Socket.gethostname}/data/deadbeef.gif", @post.file_url) assert_equal("https://#{Socket.gethostname}/data/deadbeef.gif", @post.file_url)
end end
end end