[etherpad-web/oscp-backend] Rework image to node:14-buster-slim
- From: Bartłomiej Piotrowski <bpiotrowski src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [etherpad-web/oscp-backend] Rework image to node:14-buster-slim
- Date: Wed, 13 May 2020 10:21:26 +0000 (UTC)
commit 0abf00d34788a3af0ef97cd6b79de81518a6afed
Author: Bartłomiej Piotrowski <bpiotrowski gnome org>
Date: Wed May 13 12:21:11 2020 +0200
Rework image to node:14-buster-slim
Dockerfile | 45 ++---
build.sh | 8 -
deploy.sh | 5 -
.../etherpad/docker-entrypoint.sh => entrypoint.sh | 3 +-
root/opt/etherpad/bin/fix-permissions.sh | 7 -
root/opt/etherpad/settings/settings.json | 208 ---------------------
6 files changed, 17 insertions(+), 259 deletions(-)
---
diff --git a/Dockerfile b/Dockerfile
index 6164082..3f3ef60 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,24 +1,22 @@
-FROM centos/nodejs-10-centos7
-ARG ETHERPAD_VERSION="1.8.0"
+FROM node:14-buster-slim
-USER root
+ENV ETHERPAD_VERSION 1.8.3
+ENV NODE_ENV production
-RUN mkdir -p /opt/etherpad
-COPY ./root /
+RUN apt-get update && \
+ DEBIAN_FRONTEND=noninteractive apt-get install -y \
+ ca-certificates curl unzip mariadb-client --no-install-recommends && \
+ rm -r /var/lib/apt/lists/* /var/cache/apt/*
+RUN update-ca-certificates
-# A few workarounds to run as non-root on OpenShift
-RUN curl -L -o /tmp/etherpad.tar https://github.com/ether/etherpad-lite/tarball/$ETHERPAD_VERSION && \
- tar -xzf /tmp/etherpad.tar --strip-components=1 -C /opt/etherpad && \
- rm /tmp/etherpad.tar && \
- mkdir /opt/etherpad/.npm && \
- mkdir /.npm && \
- mkdir /.config && \
- chmod 777 /.npm
+RUN cd /opt && curl -SL \
+ https://github.com/ether/etherpad-lite/archive/${ETHERPAD_VERSION}.zip \
+ > etherpad.zip && unzip etherpad && rm etherpad.zip && \
+ mv etherpad-lite-${ETHERPAD_VERSION} etherpad
WORKDIR /opt/etherpad
+RUN bin/installDeps.sh && rm settings.json
-# Install a few default plugins:
-SHELL ["/usr/bin/scl", "enable", "rh-nodejs10"]
RUN npm install ep_adminpads \
ep_delete_empty_pads \
ep_align \
@@ -27,20 +25,9 @@ RUN npm install ep_adminpads \
ep_font_color \
ep_markdown \
ep_copy_paste_select_all \
- ep_copy_paste_images \
- ep_font_family \
- ep_font_size \
- ep_aa_file_menu_toolbar
+ ep_copy_paste_images
-RUN /opt/etherpad/bin/fix-permissions.sh /opt/etherpad && \
- /opt/etherpad/bin/fix-permissions.sh /.npm && \
- /opt/etherpad/bin/fix-permissions.sh /.config && \
- /opt/etherpad/bin/fix-permissions.sh /opt/app-root
+COPY entrypoint.sh /entrypoint.sh
-# Run as a random user. This happens on openshift by default so we
-# might as well always run as a random user
-USER 1001
-
-# Listens on 9001 by default
EXPOSE 9001
-ENTRYPOINT ["/opt/etherpad/docker-entrypoint.sh"]
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/root/opt/etherpad/docker-entrypoint.sh b/entrypoint.sh
similarity index 96%
rename from root/opt/etherpad/docker-entrypoint.sh
rename to entrypoint.sh
index c4eb2fc..0052526 100755
--- a/root/opt/etherpad/docker-entrypoint.sh
+++ b/entrypoint.sh
@@ -34,5 +34,4 @@ 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_source enable rh-nodejs10
-./bin/run.sh $@
+exec ./bin/run.sh --root
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]