[etherpad-web/oscp-backend] Update to 1.8.0 and switch to centos/nodejs-10-centos7



commit 0df11bd1b5ac5bcd85264f2291da9e84a2461756
Author: Bartłomiej Piotrowski <bpiotrowski gnome org>
Date:   Tue Jan 28 11:49:36 2020 +0100

    Update to 1.8.0 and switch to centos/nodejs-10-centos7

 Dockerfile                             | 28 ++++++----------------------
 root/opt/etherpad/docker-entrypoint.sh |  1 +
 2 files changed, 7 insertions(+), 22 deletions(-)
---
diff --git a/Dockerfile b/Dockerfile
index 5920c9f..1e4f197 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,26 +1,9 @@
-FROM centos:7
-MAINTAINER Wolfgang Kulhanek <WolfgangKulhanek gmail com>
-ARG ETHERPAD_VERSION="1.7.5"
-
-LABEL name="Etherpad Lite" \
-      io.k8s.display-name="Etherpad Lite" \
-      io.k8s.description="Provide an Etherpad on top of Red Hat OpenShift." \
-      io.openshift.expose-services="9001" \
-      io.openshift.tags="etherpad" \
-      build-date="2018-12-05" \
-      version=$ETHERPAD_VERSION \
-      release="1"
-
-RUN yum -y update && \
-    yum -y install epel-release && \
-    yum -y install openssl && \
-    yum clean all && \
-    rm -rf /var/cache/yum && \
-    mkdir -p /opt/etherpad
-
-RUN curl --silent --location https://rpm.nodesource.com/setup_8.x|bash -
-RUN yum -y install nodejs
+FROM centos/nodejs-10-centos7
+ARG ETHERPAD_VERSION="1.8.0"
 
+USER root
+
+RUN mkdir -p /opt/etherpad
 COPY ./root /
 
 # A few workarounds to run as non-root on OpenShift
@@ -35,6 +18,7 @@ RUN curl -L -o /tmp/etherpad.tar  https://github.com/ether/etherpad-lite/tarball
 WORKDIR /opt/etherpad
 
 # Install a few default plugins:
+SHELL ["/usr/bin/scl", "enable", "rh-nodejs10"]
 RUN npm install ep_adminpads \
     ep_font_family \
     ep_font_size \
diff --git a/root/opt/etherpad/docker-entrypoint.sh b/root/opt/etherpad/docker-entrypoint.sh
index 5c7d025..aedb2f2 100755
--- a/root/opt/etherpad/docker-entrypoint.sh
+++ b/root/opt/etherpad/docker-entrypoint.sh
@@ -34,4 +34,5 @@ sed -i "s/DB_PORT/${DB_PORT}/" settings.json
 sed -i "s/DB_USER/${DB_USER}/" settings.json
 
 # Execute the etherpad provided startup script
+scl enable rh-nodejs10
 ./bin/run.sh $@


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]