From 11bfc5ab4a17a1d3eb3d29d7da7b7c8c096a2d7a Mon Sep 17 00:00:00 2001 From: Botond Hende Date: Sun, 30 Jun 2024 15:15:18 +0200 Subject: fixed etherpad to start but still bad request --- Dockerfile | 10 ++++++---- etherpad.service | 2 +- settings.json | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4afaa87..cbca801 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,8 @@ FROM docker.io/node:lts-alpine MAINTAINER Hende, Botond LABEL Description="Etherpad-lite server" +FROM docker.io/node:lts-alpine + ENV NODE_ENV=production RUN apk add --no-cache --virtual container-buildtime \ @@ -10,10 +12,10 @@ RUN apk add --no-cache --virtual container-buildtime \ RUN git clone --depth 1 --branch master --separate-git-dir=/tmp/etherpad https://github.com/ether/etherpad-lite /opt/etherpad WORKDIR /opt/etherpad/src -RUN npm install sqlite3 -RUN bin/installDeps.sh +RUN npm install better-sqlite3 +RUN ../bin/installDeps.sh RUN npm audit fix || true -RUN chown -R node:node /opt/etherpad +RUN chown -R node:node /opt/etherpad /home/node RUN rm -rf /tmp/etherpad COPY settings.json /opt/etherpad/settings.json @@ -23,5 +25,5 @@ RUN apk del container-buildtime USER node EXPOSE 9001/tcp -CMD ["/opt/etherpad/src/bin/run.sh"] +CMD ["/opt/etherpad/bin/run.sh"] diff --git a/etherpad.service b/etherpad.service index 98bd828..91a9bee 100644 --- a/etherpad.service +++ b/etherpad.service @@ -15,7 +15,7 @@ ExecStart = /usr/bin/podman run \ --name etherpad \ --net host \ -v /srv/etherpad/var:/opt/etherpad/var - etherpad + localhost/etherpad:latest Restart = always diff --git a/settings.json b/settings.json index f2911e8..2d335e8 100644 --- a/settings.json +++ b/settings.json @@ -199,7 +199,7 @@ "dbType": "sqlite", "dbSettings": { - "filename": "var/etherpad.db" + "filename": "/opt/etherpad/var/etherpad.db" }, /* -- cgit v1.2.3-70-g09d2