From 4baaa2ccda3c2885f20917cf259d1114d092f902 Mon Sep 17 00:00:00 2001
From: Dmitry Afanasyev <Balshbox@gmail.com>
Date: Sun, 5 Mar 2023 02:06:04 +0300
Subject: [PATCH] add fix start with jwt

---
 .env.template      |  5 +++++
 README.md          | 15 +++++++++++++++
 clean-jwt.sql      |  4 ++++
 docker-compose.yml | 19 +++++++++++++++----
 4 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 .env.template
 create mode 100644 clean-jwt.sql

diff --git a/.env.template b/.env.template
new file mode 100644
index 0000000..cc6cffb
--- /dev/null
+++ b/.env.template
@@ -0,0 +1,5 @@
+MYSQL_DB_USER=pydiouser
+MYSQL_DB_PASSWORD=cellspasswrd
+MINIO_ROOT_USER=minioadminuser
+MINIO_ROOT_PASSWORD=minioadminkey
+PUBLIC_FQDN=bot.mywistr.ru
\ No newline at end of file
diff --git a/README.md b/README.md
index 7961377..f3055b1 100644
--- a/README.md
+++ b/README.md
@@ -51,3 +51,18 @@ Access https://caddy:8585/ to access Cells. Enjoy!
 docker-compose down -v --remove-orphan
 ```
 
+## Clean jwt table
+
+```bash
+docker exec -i pydio_mysql mysql -u pydiouser -pcellspasswrd cells < clean-jwt.sql
+```
+
+
+```sql
+SET FOREIGN_KEY_CHECKS = 0;
+TRUNCATE hydra_oauth2_trusted_jwt_bearer_issuer;
+TRUNCATE hydra_jwk;
+SET FOREIGN_KEY_CHECKS = 0;
+
+```
+
diff --git a/clean-jwt.sql b/clean-jwt.sql
new file mode 100644
index 0000000..41501aa
--- /dev/null
+++ b/clean-jwt.sql
@@ -0,0 +1,4 @@
+SET FOREIGN_KEY_CHECKS = 0;
+TRUNCATE hydra_oauth2_trusted_jwt_bearer_issuer;
+TRUNCATE hydra_jwk;
+SET FOREIGN_KEY_CHECKS = 1;
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 261b586..55ef57b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,6 +13,7 @@ services:
   # MySQL DB
   mysql:
     image: mysql:8.0.32
+    container_name: pydio_mysql
     restart: unless-stopped
     volumes:
       - mysql_data:/var/lib/mysql
@@ -26,12 +27,15 @@ services:
   # Mongo DB
   mongo:
     image:  mongo:6.0.4
+    container_name: pydio_mongo
     restart: unless-stopped
     expose: [27017]
 
   # Nats events broker
   nats:
     image: nats:2.9.15
+    container_name: pydio_nats
+    restart: unless-stopped
     expose:
       - 4222
       - 8222
@@ -40,12 +44,16 @@ services:
 
   redis:
     image: redis:7.0.9
+    container_name: pydio_redis
     hostname: redis
+    restart: unless-stopped
     expose: [6379]
 
   minio:
-    image: quay.io/minio/minio
-    command: server --console-address ":9001" /data
+    image: minio/minio:RELEASE.2023-02-27T18-10-45Z
+    command: [ "server", "/data", "--console-address", ":9001" ]
+    restart: unless-stopped
+    container_name: pydio_minio
     hostname: minio
     environment:
       MINIO_ROOT_USER: ${MINIO_ROOT_USER}
@@ -55,10 +63,11 @@ services:
     ports:
       - "9001:9001"
     volumes:
-      - cells_data:/data
+      - ./cells_data:/data
 
   createbuckets:
     image: minio/mc:RELEASE.2023-02-28T00-12-59Z
+    container_name: pydio_create_buckets
     depends_on:
       - minio
     entrypoint: >
@@ -77,6 +86,7 @@ services:
     image: pydio/cells:4.1
     restart: unless-stopped
     hostname: cells
+    container_name: pydio_cells
     expose: [80]
     environment:
       - CELLS_WORKING_DIR=/var/cells
@@ -96,10 +106,11 @@ services:
   # Caddy reverse proxy, exposed as self-signed on port 445
   caddy:
     image:  caddy:2.6.4-alpine
+    container_name: pydio_caddy
     ports: ["8080:8080"]
     restart: unless-stopped
     volumes:
       - ./conf/Caddyfile:/etc/caddy/Caddyfile
       - caddy_logs:/var/caddy/logs
       - caddy_data:/data
-      - caddy_config:/config
\ No newline at end of file
+      - caddy_config:/config