Configure Git for `discourse` user

[discourse_docker.git] / image / base / Dockerfile

diff --git a/image/base/Dockerfile b/image/base/Dockerfile
index f9c2e6bc5912b9431bc8a39e6a2efb5210e93988..7ab59074790ca4db7c6d5020fe71ff256092c5ad 100644 (file)
--- a/image/base/Dockerfile
+++ b/image/base/Dockerfile
@@ -64,15 +64,17 @@ RUN mkdir /jemalloc-new && cd /jemalloc-new &&\
       tar -xjf jemalloc-5.1.0.tar.bz2 && cd jemalloc-5.1.0 && ./configure --prefix=/usr --with-install-suffix=5.1.0 && make build_lib && make install_lib &&\
       cd / && rm -rf /jemalloc-new
 
-RUN echo 'gem: --no-document' >> /usr/local/etc/gemrc &&\
+RUN apt-get -y install ruby &&\
+    echo 'gem: --no-document' >> /usr/local/etc/gemrc &&\
     mkdir /src && cd /src && git clone https://github.com/sstephenson/ruby-build.git &&\
     cd /src/ruby-build && ./install.sh &&\
-    cd / && rm -rf /src/ruby-build && (ruby-build 2.5.1 /usr/local)
+    cd / && rm -rf /src/ruby-build && (ruby-build 2.5.2 /usr/local) &&\
+    apt-get -y remove ruby
 
 RUN gem update --system
 
 RUN gem install bundler --force &&\
-    rm -rf /usr/local/share/ri/2.5.1/system &&\
+    rm -rf /usr/local/share/ri/2.5.2/system &&\
     cd / && git clone https://github.com/discourse/pups.git
 
 ADD install-imagemagick /tmp/install-imagemagick
@@ -139,4 +141,5 @@ RUN useradd discourse -s /bin/bash -m -U &&\
     cd /var/www/discourse &&\
     sudo -u discourse bundle install --deployment \
          --without test --without development &&\
+    bundle exec rake maxminddb:get &&\
     find /var/www/discourse/vendor/bundle -name tmp -type d -exec rm -rf {} +