Use hyphens in container, image and network names

.env

@@ -1,5 +1,5 @@
 POSTGRES_PASSWORD=postgres_password
 POSTGRES_USER=engineuser
-POSTGRES_HOST=quotient_database
+POSTGRES_HOST=quotient-database
 POSTGRES_DB=engine
 REDIS_PASSWORD=redis_password

README.md

@@ -41,9 +41,9 @@ Create a `.env` file with the following required variables:
 POSTGRES_USER=engineuser
 POSTGRES_PASSWORD=<your-db-password>
 POSTGRES_DB=engine
-POSTGRES_HOST=quotient_database
+POSTGRES_HOST=quotient-database
 REDIS_PASSWORD=<your-redis-password>
-REDIS_HOST=quotient_redis
+REDIS_HOST=quotient-redis
 ```
 
 Optional variables:
@@ -149,7 +149,7 @@ ip = "10.100.1_.2"
 [RequiredSettings]
 EventName = "Name of my Competition"
 EventType = "rvb"  # Use "rvb" for Red vs Blue (CCDC-style)
-DBConnectURL = "postgres://engineuser:password@quotient_database:5432/engine"
+DBConnectURL = "postgres://engineuser:password@quotient-database:5432/engine"
 BindAddress = "0.0.0.0"
 ```
 

config/event.conf.example

@@ -14,7 +14,7 @@
 [RequiredSettings]
   EventName = "Example Competition"
   EventType = "rvb"
-  DBConnectURL = "postgres://engineuser:your_password@quotient_database:5432/engine"
+  DBConnectURL = "postgres://engineuser:your_password@quotient-database:5432/engine"
   BindAddress = "0.0.0.0"
 
 [MiscSettings]

docker-compose.base.yml

@@ -12,7 +12,7 @@ services:
       retries: 5
       start_period: 3s
     networks:
-      - quotient_network
+      - quotient-network
 
   redis-base:
     image: redis:alpine
@@ -26,4 +26,4 @@ services:
       retries: 5
       start_period: 3s
     networks:
-      - quotient_network
+      - quotient-network

docker-compose.yml

@@ -12,14 +12,14 @@ services:
     extends:
       file: docker-compose.base.yml
       service: db-base
-    container_name: quotient_database
+    container_name: quotient-database
     restart: always
     volumes:
       - db_data:/var/lib/postgresql/data
 
   server:
-    container_name: quotient_server
-    image: quotient_server
+    container_name: quotient-server
+    image: quotient-server
     build:
       context: .
       dockerfile: Dockerfile
@@ -32,7 +32,7 @@ services:
       db:
         condition: service_healthy
     networks:
-      - quotient_network
+      - quotient-network
     volumes:
       - ./submissions:/app/submissions
       - ./config:/app/config
@@ -55,7 +55,7 @@ services:
       file: docker-compose.base.yml
       service: redis-base
     restart: always
-    container_name: quotient_redis
+    container_name: quotient-redis
     ports:
       - "127.0.0.1:6379:6379"
     volumes:
@@ -78,7 +78,7 @@ services:
       db:
         condition: service_healthy
     networks:
-      - quotient_network
+      - quotient-network
     volumes:
       - ./submissions:/app/submissions
       - ./custom-checks:/app/checks
@@ -102,7 +102,7 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock:ro # Needed to read runner names
 
 networks:
-  quotient_network:
+  quotient-network:
     driver: bridge
 
 volumes:

engine/engine.go

@@ -54,7 +54,7 @@ func NewEngine(conf *config.ConfigSettings, configPath string) *ScoringEngine {
 
 	redisAddr := os.Getenv("REDIS_ADDR")
 	if redisAddr == "" {
-		redisAddr = "quotient_redis:6379"
+		redisAddr = "quotient-redis:6379"
 	}
 	rdb := redis.NewClient(&redis.Options{
 		Addr:     redisAddr,
@@ -129,7 +129,7 @@ func (se *ScoringEngine) Start() {
 
 	redisAddr := os.Getenv("REDIS_ADDR")
 	if redisAddr == "" {
-		redisAddr = "quotient_redis:6379"
+		redisAddr = "quotient-redis:6379"
 	}
 
 	rdb := redis.NewClient(&redis.Options{
@@ -197,7 +197,7 @@ func waitForReset() {
 
 	redisAddr := os.Getenv("REDIS_ADDR")
 	if redisAddr == "" {
-		redisAddr = "quotient_redis:6379"
+		redisAddr = "quotient-redis:6379"
 	}
 
 	rdb := redis.NewClient(&redis.Options{
@@ -374,7 +374,7 @@ func (se *ScoringEngine) rvb() error {
 	//
 	redisAddr := os.Getenv("REDIS_ADDR")
 	if redisAddr == "" {
-		redisAddr = "quotient_redis:6379"
+		redisAddr = "quotient-redis:6379"
 	}
 
 	rdb := redis.NewClient(&redis.Options{

runner/runner.go

@@ -42,7 +42,7 @@ func runApp(err error) int {
 
 	redisAddr := os.Getenv("REDIS_ADDR")
 	if redisAddr == "" {
-		redisAddr = "quotient_redis:6379"
+		redisAddr = "quotient-redis:6379"
 	}
 
 	rdb := redis.NewClient(&redis.Options{