Merge pull request #306 from dachrisch/deploy

dependency update and docker config
chris0chris · Mar 3, 2025 · a380a68 · a380a68
2 parents 6d21fc6 + dc6b60b
commit a380a68
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 144 deletions.
diff --git a/deployed/docker-compose.yaml b/deployed/docker-compose.yaml
@@ -1,9 +1,9 @@
+name: ${SERVICE_NAME}
 services:
   www:
     image: leaguesphere/frontend:latest
-    container_name: ${SERVICE_NAME}.www
+    container_name: ${COMPOSE_PROJECT_NAME}.www
     labels:
-      - traefik.http.services.${SERVICE_NAME}.name=${SERVICE_NAME}
       # redirect service
       # https://jensknipper.de/blog/traefik-http-to-https-redirect/
       - traefik.http.routers.${SERVICE_NAME}-http.entrypoints=web
@@ -38,11 +38,12 @@ services:
 
   app:
     image: leaguesphere/backend:latest
-    container_name: ${SERVICE_NAME}.app
+    container_name: ${COMPOSE_PROJECT_NAME}.app
     command: gunicorn -b 0.0.0.0:8000 league_manager.wsgi
     labels:
+      - traefik.enable=false
       # portainer team
-      - io.portainer.accesscontrol.teams=leaguesphere
+      - io.portainer.accesscontrol.teams=${SERVICE_NAME}
     environment:
       MYSQL_HOST: db
       MYSQL_DB_NAME: ${MYSQL_DB_NAME}
@@ -59,11 +60,12 @@ services:
 
   db:
     image: mariadb:lts
-    container_name: ${SERVICE_NAME}.db
+    container_name: ${COMPOSE_PROJECT_NAME}.db
     command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --default-storage-engine=InnoDB
     labels:
+      - traefik.enable=false
       # portainer team
-      - io.portainer.accesscontrol.teams=leaguesphere
+      - io.portainer.accesscontrol.teams=${SERVICE_NAME}
     volumes:
       - "./database:/var/lib/mysql"
     networks:

diff --git a/liveticker/package-lock.json b/liveticker/package-lock.json
diff --git a/liveticker/package.json b/liveticker/package.json
@@ -35,9 +35,9 @@
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.2.0",
     "@testing-library/user-event": "^14.6.1",
-    "babel-loader": "^9.2.1",
+    "babel-loader": "^10.0.0",
     "eslint": "^9.20.1",
-    "eslint-config-prettier": "^10.0.1",
+    "eslint-config-prettier": "^10.0.2",
     "eslint-formatter-junit": "^8.40.0",
     "eslint-plugin-react": "^7.37.4",
     "globals": "^16.0.0",

diff --git a/scorecard/package-lock.json b/scorecard/package-lock.json
diff --git a/scorecard/package.json b/scorecard/package.json
@@ -39,7 +39,7 @@
     "@testing-library/user-event": "^14.6.1",
     "babel-loader": "^9.2.1",
     "eslint": "^9.20.1",
-    "eslint-config-prettier": "^10.0.1",
+    "eslint-config-prettier": "^10.0.2",
     "eslint-formatter-junit": "^8.40.0",
     "eslint-plugin-react": "^7.37.4",
     "globals": "^16.0.0",