Switched know wapp to Wiki.js

MichaelSchmidle · Jan 14, 2020 · cbd4b88 · cbd4b88
1 parent f628e1b
commit cbd4b88
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 33 deletions.
diff --git a/composition/ipam/docker-compose.yml b/composition/ipam/docker-compose.yml
@@ -10,6 +10,8 @@ services:
       - "POSTGRES_USER=${POSTGRES_USER}"
       - "POSTGRES_PASSWORD=${POSTGRES_PASSWORD}"
     image: "postgres"
+    labels:
+      - "com.centurylinklabs.watchtower.enable=true"
     networks:
       - "wapps"
     restart: "always"

diff --git a/composition/know/docker-compose.yml b/composition/know/docker-compose.yml
@@ -4,28 +4,28 @@ networks:
     external:
       name: "wapps"
 services:
-  mysql-af9dc3cd6ce29d560a1e4077694254d9:
+  postgres-af9dc3cd6ce29d560a1e4077694254d9:
     environment:
-      - "MYSQL_DATABASE=${MYSQL_DATABASE}"
-      - "MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}"
-      - "MYSQL_USER=${MYSQL_USER}"
-      - "MYSQL_PASSWORD=${MYSQL_PASSWORD}"
-    image: "mysql:5"
+      - "POSTGRES_DB=${POSTGRES_DB}"
+      - "POSTGRES_USER=${POSTGRES_USER}"
+      - "POSTGRES_PASSWORD=${POSTGRES_PASSWORD}"
+    image: "postgres"
     labels:
       - "com.centurylinklabs.watchtower.enable=true"
     networks:
       - "wapps"
     restart: "always"
     volumes:
-      - "mysql:/var/lib/mysql"
-  bookstack:
+      - "data:/var/lib/postgresql/data"
+  wikijs:
     environment:
-      - "APP_URL=https://${HOST}"
-      - "DB_HOST=mysql-af9dc3cd6ce29d560a1e4077694254d9:3306"
-      - "DB_DATABASE=${MYSQL_DATABASE}"
-      - "DB_USERNAME=${MYSQL_USER}"
-      - "DB_PASSWORD=${MYSQL_PASSWORD}"
-    image: "solidnerd/bookstack"
+      - "DB_TYPE=postgres"
+      - "DB_HOST=postgres-af9dc3cd6ce29d560a1e4077694254d9"
+      - "DB_PORT=5432"
+      - "DB_USER=${POSTGRES_USER}"
+      - "DB_PASS=${POSTGRES_PASSWORD}"
+      - "DB_NAME=${POSTGRES_DB}"
+    image: "requarks/wiki"
     labels:
       - "com.centurylinklabs.watchtower.enable=true"
       - "traefik.http.routers.bookstack-http.entrypoints=http"
@@ -34,17 +34,12 @@ services:
       - "traefik.http.routers.bookstack-https.entrypoints=https"
       - "traefik.http.routers.bookstack-https.rule=Host(`${HOST}`)"
       - "traefik.http.routers.bookstack-https.tls.certResolver=wapps"
-      - "traefik.http.services.bookstack.loadbalancer.server.port=80"
+      - "traefik.http.services.bookstack.loadbalancer.server.port=3000"
     networks:
       - "wapps"
     restart: "always"
     volumes:
-      - "uploads:/var/www/bookstack/public/uploads"
-      - "storage:/var/www/bookstack/public/storage"
+      - ""
 volumes:
-  mysql:
-    driver: local
-  uploads:
-    driver: local
-  storage:
+  data:
     driver: local
diff --git a/composition/safe/README.md b/composition/safe/README.md
@@ -3,3 +3,9 @@
 The safe wapp is based on [Passit](https://passit.io/).
 
 > Peace of mind for passwords
+
+# Notes
+
+After deploying and upgrading this wapp, you need to run the database migration routine via the containers command line. Inside Portainer, select the container ``${NAME}_passit_1``. Connect to the container's console, and execute the following command:
+
+``./manage.py migrate``
diff --git a/composition/safe/docker-compose.yml b/composition/safe/docker-compose.yml
@@ -4,6 +4,19 @@ networks:
     external:
       name: "wapps"
 services:
+  postgres-1a1dc91c907325c69271ddf0c944bc72:
+    environment:
+      - "POSTGRES_DB=${POSTGRES_DB}"
+      - "POSTGRES_USER=${POSTGRES_USER}"
+      - "POSTGRES_PASSWORD=${POSTGRES_PASSWORD}"
+    image: "postgres"
+    labels:
+      - "com.centurylinklabs.watchtower.enable=true"
+    networks:
+      - "wapps"
+    restart: "always"
+    volumes:
+      - "data:/var/lib/postgresql/data"
   passit:
     command: "bin/start.sh"
     environment:
@@ -26,17 +39,6 @@ services:
     networks:
       - "wapps"
     restart: "always"
-  postgres-1a1dc91c907325c69271ddf0c944bc72:
-    environment:
-      - "POSTGRES_DB=${POSTGRES_DB}"
-      - "POSTGRES_USER=${POSTGRES_USER}"
-      - "POSTGRES_PASSWORD=${POSTGRES_PASSWORD}"
-    image: "postgres"
-    networks:
-      - "wapps"
-    restart: "always"
-    volumes:
-      - "data:/var/lib/postgresql/data"
 volumes:
   data:
     driver: local    
diff --git a/composition/trck/docker-compose.yml b/composition/trck/docker-compose.yml
@@ -11,6 +11,8 @@ services:
       - "MYSQL_USER=${MYSQL_USER}"
       - "MYSQL_PASSWORD=${MYSQL_PASSWORD}"
     image: "mysql:5"
+    labels:
+      - "com.centurylinklabs.watchtower.enable=true"
     networks:
       - "wapps"
     restart: "always"