[whimsy] branch master updated: Update for Ubuntu 20.04

[se...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new f3d275d  Update for Ubuntu 20.04
f3d275d is described below

commit f3d275d75f6072a1e883180b049eff22c0b363ac
Author: Sebb <se...@apache.org>
AuthorDate: Sat Oct 24 17:29:10 2020 +0100

    Update for Ubuntu 20.04
---
 docker/Dockerfile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 950f050..f42e4e1 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,6 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
+
+# N.B. passenger --install_dir=/var/lib/gems/m.n.o must agree with ruby version
 
 ENV GEM_HOME="/srv/gems" \
     LANG=C.UTF-8 \
@@ -36,7 +38,7 @@ RUN apt-get update && \
       libapr1-dev \
       libaprutil1-dev && \
     gem update --system &&\
-    gem install bundler passenger --install_dir=/var/lib/gems/2.5.0 && \
+    gem install bundler passenger --install_dir=/var/lib/gems/2.7.0 && \
     passenger-install-apache2-module --auto && \
     passenger-install-apache2-module --snippet > \
       /etc/apache2/conf-enabled/passenger.conf && \