diff --git a/backend/prisma/.env b/backend/prisma/.env deleted file mode 100644 index bb50dd3..0000000 --- a/backend/prisma/.env +++ /dev/null @@ -1 +0,0 @@ -DATABASE_URL="mysql://root:lGmKgXmydCT4u2sXHk7IeM@humenius.me:13307/sinusbot?schema=sinusbot" \ No newline at end of file diff --git a/backend/prisma/schema.prisma b/backend/prisma/schema.prisma index c6775cb..02ba407 100644 --- a/backend/prisma/schema.prisma +++ b/backend/prisma/schema.prisma @@ -4,7 +4,7 @@ generator client { datasource db { provider = "mysql" - url = "mysql://root:lGmKgXmydCT4u2sXHk7IeM@humenius.me:13307/sinusbot?schema=sinusbot" + url = env("DATABASE_URL") } model ranks { diff --git a/docker-compose.yml b/docker-compose.yml index a388136..c73f6c4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,6 +10,9 @@ services: - traefik.enable=true - traefik.http.services.tsotr-frontend.loadbalancer.server.port=5000 + # Watchtower update + - com.centurylinklabs.watchtower.enable=true + # HTTP + Redirect - traefik.http.routers.tsotr-frontend.entrypoints=web - traefik.http.routers.tsotr-frontend.rule=Host(`tsotr.humenius.me`) @@ -24,10 +27,14 @@ services: image: docker.humenius.me/humenius/ts-onlinetime-ranks-backend:latest networks: - proxy + - ts-onlinetime-ranks env_file: .env labels: - traefik.enable=true - - traefik.http.services.tsotr-backend.loadbalancer.server.port=3000 + - traefik.http.services.tsotr-backend.loadbalancer.server.port=3500 + + # Watchtower update + - com.centurylinklabs.watchtower.enable=true # HTTP + Redirect - traefik.http.routers.tsotr-backend.entrypoints=web @@ -39,6 +46,27 @@ services: - traefik.http.routers.tsotr-backend-secure.rule=Host(`api.tsotr.humenius.me`) - traefik.http.routers.tsotr-backend-secure.tls.certresolver=letsencrypt + db: + hostname: ts-onlinetime-ranks-db + image: docker.io/bitnami/mariadb:10.5-debian-10 + env_file: .env + networks: + - ts-onlinetime-ranks + healthcheck: + test: ['CMD', '/opt/bitnami/scripts/mariadb/healthcheck.sh'] + interval: 15s + timeout: 5s + retries: 6 + volumes: + - ts-onlinetime-ranks-db:/bitnami/mariadb + networks: proxy: external: true + ts-onlinetime-ranks: + external: true + +volumes: + ts-onlinetime-ranks-db: + driver: local +