Browse Source

pad: allow the user to choose his theme, fix #65

Guilhem Saurel 6 years ago
parent
commit
a61400a659
3 changed files with 16 additions and 12 deletions
  1. 4 9
      pad/Dockerfile
  2. 6 0
      pad/README.md
  3. 6 3
      pad/docker-compose.yml

+ 4 - 9
pad/Dockerfile

@@ -1,14 +1,9 @@
-FROM node:9-alpine as build
-
-RUN apk add --no-cache curl
-RUN mkdir /front-pad
-RUN curl -sSL https://framagit.org/oxyta.net/front-pad/repository/master/archive.tar.gz | tar --directory /front-pad -xz --strip 1
-WORKDIR /front-pad
-RUN npm set progress=false && npm i && npm run css
+ARG THEME_IMAGE
 
+FROM ${THEME_IMAGE} AS build
 FROM tvelocity/etherpad-lite
 
 WORKDIR /opt/etherpad-lite
 
-COPY --from=build /front-pad/index.html src/templates/
-COPY --from=build /front-pad/static/custom/index.css src/static/custom/
+COPY --from=build /opt/etherpad-lite/src/templates/index.html src/templates/
+COPY --from=build /opt/etherpad-lite/src/static/custom/index.css src/static/custom/

+ 6 - 0
pad/README.md

@@ -10,6 +10,12 @@ echo ETHERPAD_DB_PASSWORD=$DB_PASSWORD >> .env
 echo ETHERPAD_TITLE=Bloc Note >> .env
 ```
 
+## (Optionnal) Add a theme
+
+```
+echo THEME_IMAGE=oxytanet/front-pad >> .env
+```
+
 ## Deploy
 ```
 docker-compose up -d

+ 6 - 3
pad/docker-compose.yml

@@ -16,10 +16,13 @@ services:
       - ${CHATONS_ROOT_DIR:-/srv/chatons}/${CHATONS_SERVICE:-pad}/db:/var/lib/postgresql/data
 
   app:
-    build: .
+    build:
+     context: .
+     args:
+       THEME_IMAGE: ${THEME_IMAGE:-tvelocity/etherpad-lite}
     restart: unless-stopped
     environment:
-      - POSTGRES_DB_HOST=db
+      - ETHERPAD_DB_HOST=db
       - ETHERPAD_DB_TYPE=postgres
       - ETHERPAD_DB_USER=etherpad
       - ETHERPAD_DB_PORT=5432
@@ -29,7 +32,7 @@ services:
       traefik.enable: "true"
       traefik.frontend.rule: "Host: ${CHATONS_SERVICE:-pad}.${CHATONS_DOMAIN:-localhost}, www.${CHATONS_SERVICE:-pad}.${CHATONS_DOMAIN:-localhost}"
     networks:
-      - default
       - web
+      - default
     volumes:
       - ${CHATONS_ROOT_DIR:-/srv/chatons}/${CHATONS_SERVICE:-pad}/app:/opt/etherpad-lite/var