146 custom port mapping (#147)

* Move port config to project * Add newline after postgres messages * Map PostgresPort and AirflowWebserverPort to standard 5432 and 8080; Remove AirflowWebserverPort exporsure and WEB_SERVER_PORT env var * Move port to a nested webserver attribute
astronomer · Nov 21, 2018 · 7e8d96a · 7e8d96a
1 parent da79ff3
commit 7e8d96a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/airflow/docker.go b/airflow/docker.go
@@ -181,7 +181,7 @@ func Start(airflowHome string) error {
 		}
 	}
 	fmt.Printf(messages.COMPOSE_LINK_WEBSERVER+"\n", config.CFG.WebserverPort.GetString())
-	fmt.Printf(messages.COMPOSE_LINK_POSTGRES, config.CFG.PostgresPort.GetString())
+	fmt.Printf(messages.COMPOSE_LINK_POSTGRES+"\n", config.CFG.PostgresPort.GetString())
 	return nil
 }
 

diff --git a/airflow/include/composeyml.go b/airflow/include/composeyml.go
@@ -26,7 +26,7 @@ services:
       io.astronomer.docker: "true"
       io.astronomer.docker.cli: "true"
     ports:
-      - {{ .PostgresPort }}:{{ .PostgresPort }}
+      - {{ .PostgresPort }}:5432
     volumes:
       - postgres_data:/var/lib/postgresql/data
     environment:
@@ -48,7 +48,7 @@ services:
       - postgres
     environment:
       AIRFLOW__CORE__EXECUTOR: LocalExecutor
-      AIRFLOW__CORE__SQL_ALCHEMY_CONN: postgresql://{{ .PostgresUser }}:{{ .PostgresPassword }}@{{ .PostgresHost }}:{{ .PostgresPort }}
+      AIRFLOW__CORE__SQL_ALCHEMY_CONN: postgresql://{{ .PostgresUser }}:{{ .PostgresPassword }}@{{ .PostgresHost }}:5432
       AIRFLOW__CORE__LOAD_EXAMPLES: "False"
       AIRFLOW__CORE__FERNET_KEY: "d6Vefz3G9U_ynXB3cr7y_Ak35tAHkEGAVxuz_B-jzWw="
     volumes:
@@ -72,15 +72,12 @@ services:
       - scheduler
       - postgres
     environment:
-      AIRFLOW__WEBSERVER__WEB_SERVER_PORT: {{ .AirflowWebserverPort }}
       AIRFLOW__CORE__EXECUTOR: LocalExecutor
-      AIRFLOW__CORE__SQL_ALCHEMY_CONN: postgresql://{{ .PostgresUser }}:{{ .PostgresPassword }}@{{ .PostgresHost }}:{{ .PostgresPort }}
+      AIRFLOW__CORE__SQL_ALCHEMY_CONN: postgresql://{{ .PostgresUser }}:{{ .PostgresPassword }}@{{ .PostgresHost }}:5432
       AIRFLOW__CORE__LOAD_EXAMPLES: "False"
       AIRFLOW__CORE__FERNET_KEY: "d6Vefz3G9U_ynXB3cr7y_Ak35tAHkEGAVxuz_B-jzWw="
     ports:
-      - {{ .AirflowWebserverPort }}:{{ .AirflowWebserverPort }}
-    expose:
-      - {{ .AirflowWebserverPort }}
+      - {{ .AirflowWebserverPort }}:8080
     volumes:
       - {{ .AirflowHome }}/dags:/usr/local/airflow/dags:ro
       - {{ .AirflowHome }}/plugins:/usr/local/airflow/plugins:ro