Merge branch 'develop' into release

Cufee · Jan 18, 2025 · aa4deb7 · aa4deb7
2 parents 9f491a1 + 9df1344
commit aa4deb7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/docker-compose.base.yaml b/docker-compose.base.yaml
@@ -25,7 +25,6 @@ services:
       dockerfile: Dockerfile
       args:
         BRAND_FLAVOR: ${BRAND_FLAVOR}
-    restart: always
     volumes:
       - ${DATABASE_PATH}:/data
     env_file:

diff --git a/docker-compose.dokploy.yaml b/docker-compose.dokploy.yaml
@@ -3,6 +3,7 @@ services:
     extends:
       file: docker-compose.base.yaml
       service: aftermath-collector-base
+    restart: always
     environment:
       - COLLECTOR_BACKEND_URL=aftermath-service:${PRIVATE_SERVER_PORT}
     networks:
@@ -19,6 +20,7 @@ services:
     extends:
       file: docker-compose.base.yaml
       service: aftermath-service-base
+    restart: always
     environment:
       # the rest is imported from .env, which is going to be created by Dokploy automatically
       - PORT=3000 # the port does not matter, but it needs to match Traefik labels. we set it here explicitly in order to avoid any issues

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -3,17 +3,20 @@ services:
     extends:
       file: docker-compose.base.yaml
       service: aftermath-collector-base
+    restart: no
     command: --backend=aftermath-service:${PRIVATE_SERVER_PORT}
 
   aftermath-migrate:
     extends:
       file: docker-compose.base.yaml
       service: aftermath-migrate-base
+    restart: no
 
   aftermath-service:
     extends:
       file: docker-compose.base.yaml
       service: aftermath-service-base
+    restart: no
     environment:
       # use the default port from .env
       - DATABASE_PATH=/data # this is the path inside a container and needs to match the volume mount

diff --git a/internal/render/v1/init.go b/internal/render/v1/init.go
@@ -20,9 +20,9 @@ var (
 	TextSubscriptionPlus    = color.NRGBA{72, 167, 250, 255}
 	TextSubscriptionPremium = color.NRGBA{255, 223, 0, 255}
 
-	DefaultCardColor        = color.NRGBA{10, 10, 10, 180}
+	DefaultCardColor        = color.NRGBA{10, 10, 10, 150}
 	DefaultCardColorNoAlpha = color.NRGBA{10, 10, 10, 255}
-	ClanTagBackgroundColor  = color.NRGBA{10, 10, 10, 120}
+	ClanTagBackgroundColor  = color.NRGBA{10, 10, 10, 100}
 
 	ColorAftermathRed    = color.NRGBA{255, 0, 120, 255}
 	ColorAftermathBlue   = color.NRGBA{72, 167, 250, 255}