fixed volume and postgres container naming convention in docker compo…

…se (#482)
astronomer · Jan 20, 2022 · 276f89a · 276f89a
1 parent 2cb8531
commit 276f89a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/airflow/container.go b/airflow/container.go
@@ -140,7 +140,7 @@ func generateConfig(projectName, airflowHome, envFile string, imageLabels map[st
 		AirflowWebserverPort:   config.CFG.WebserverPort.GetString(),
 		AirflowEnvFile:         envFile,
 		MountLabel:             "z",
-		ProjectName:            projectName,
+		ProjectName:            sanitizeRepoName(projectName),
 		TriggererEnabled:       triggererEnabled,
 		SchedulerContainerName: config.CFG.SchedulerContainerName.GetString(),
 		WebserverContainerName: config.CFG.WebserverContainerName.GetString(),

diff --git a/airflow/docker_test.go b/airflow/docker_test.go
@@ -55,12 +55,15 @@ networks:
 volumes:
   postgres_data:
     driver: local
+    name: test-project-name_postgres_data
   airflow_logs:
     driver: local
+    name: test-project-name_airflow_logs
 
 services:
   postgres:
     image: postgres:12.2
+    container_name: test-project-name-postgres
     restart: unless-stopped
     networks:
       - airflow

diff --git a/airflow/include/composeyml.go b/airflow/include/composeyml.go
@@ -13,12 +13,15 @@ networks:
 volumes:
   postgres_data:
     driver: local
+    name: {{ .ProjectName }}_postgres_data
   airflow_logs:
     driver: local
+    name: {{ .ProjectName }}_airflow_logs
 
 services:
   postgres:
     image: postgres:12.2
+    container_name: {{ .ProjectName }}-postgres
     restart: unless-stopped
     networks:
       - airflow