X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=image%2Fbase%2FDockerfile;h=ba51a214ca5a3a3b13c865faf7f3be7959eea358;hb=c87937dc40abe2791a128b4463a6a5ceba181be4;hp=bd771a1037d271af34b153cc580ddc86e41d4295;hpb=b95ea6f77a250793dc8e33f5e54571294db543e6;p=discourse_docker.git

diff --git a/image/base/Dockerfile b/image/base/Dockerfile
index bd771a1..ba51a21 100644
--- a/image/base/Dockerfile
+++ b/image/base/Dockerfile
@@ -28,7 +28,7 @@ RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main" | \
         tee /etc/apt/sources.list.d/postgres.list
 RUN curl --silent --location https://deb.nodesource.com/setup_10.x | sudo bash -
 RUN apt -y update
-RUN apt -y install build-essential git wget \
+RUN apt -y install build-essential git wget rsync \
                        libxslt-dev libcurl4-openssl-dev \
                        libssl-dev libyaml-dev libtool \
                        libxml2-dev gawk parallel \
@@ -49,7 +49,7 @@ RUN cd / &&\
     rm -f /etc/apt/apt.conf.d/40proxy &&\
     locale-gen en_US &&\
     apt install -y nodejs &&\
-    npm install -g uglify-js@"<3" &&\
+    npm install -g uglify-js &&\
     npm install -g svgo
 
 ADD install-nginx /tmp/install-nginx
@@ -70,12 +70,12 @@ RUN mkdir /jemalloc-new && cd /jemalloc-new &&\
 RUN 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.6.3 /usr/local)
+    cd / && rm -rf /src/ruby-build && (ruby-build 2.6.5 /usr/local)
 
 RUN gem update --system
 
 RUN gem install bundler --force &&\
-    rm -rf /usr/local/share/ri/2.6.3/system &&\
+    rm -rf /usr/local/share/ri/2.6.5/system &&\
     cd / && git clone https://github.com/discourse/pups.git
 
 ADD install-redis /tmp/install-redis