diff --git a/config/docker/danbooru-base b/config/docker/danbooru-base index 9a5fd9b8b..23383deff 100644 --- a/config/docker/danbooru-base +++ b/config/docker/danbooru-base @@ -8,7 +8,13 @@ RUN apt-get update && \ 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 && \ - 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 libgif-dev && \ + apt-get -y install -qq curl gnupg apt-transport-https apt-utils build-essential automake libssl-dev libxml2-dev libxslt-dev ncurses-dev sudo libreadline-dev flex bison ragel memcached libmemcached-dev git libcurl4-openssl-dev imagemagick libmagickcore-dev libmagickwand-dev sendmail-bin sendmail postgresql-client libpq-dev nginx ssh coreutils ffmpeg mkvtoolnix emacs24-nox telnet libgif-dev && \ + curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \ + echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \ + curl -sSL https://deb.nodesource.com/setup_10.x | sudo -E bash - && \ + apt-get update && \ + apt-get -y install nodejs yarn && \ + apt-get remove cmdtest && \ apt-get clean && \ cd /tmp && \ wget -q https://github.com/jcupitt/libvips/releases/download/v$VIPS_VERSION/vips-$VIPS_VERSION.tar.gz && \ @@ -36,6 +42,7 @@ RUN echo 'gem: --no-document' > ~/.gemrc && \ gem install bundler --quiet WORKDIR /app RUN bundle install +RUN yarn install COPY script/install/database.yml.templ /app/config/database.yml COPY script/install/danbooru_local_config.rb.templ /app/config/danbooru_local_config.rb EXPOSE 3000