Adjustments for Tomcat Catalina Connector (#2)

Adding the so called "deprecated" `CATALINA_CONNECTOR_...` environment variables leads to server.xml template getting properly populated.

Verified to work: https://bamboo.mkdevops.se

.env-template

@@ -1,6 +1,8 @@
 # Proxy
 PROXY_HOSTNAME=mrsmith-codespaces-proxy-for-bamboo-ci-health-8085.githubpreview.dev
 PROXY_PORT=443
+PROXY_SCHEME=https
+PROXY_SECURE=true
 
 # Bamboo
 BAMBOO_SECURITY_TOKEN=myPasswordsAreLeaking
@@ -12,6 +14,7 @@ [email protected]
 
 # Database
 DB_TYPE=postgresql
+DB_PORT=5432
 DB_NAME=bamboo
 DB_USER=bamboouser
 DB_PASSWORD=p4ssw0rd

README.md

@@ -14,7 +14,7 @@ e.g. excessive retention of build results, inefficient use of build artifacts
 
 ## Getting Started
 
-Create a local Bamboo-PostgreSQL deployment using Docker:
+Create a local Bamboo-PostgreSQL deployment using Docker (version 20.10 or newer):
 
     cp -v .env-template .env
     vi .env  # Fill out with your own license and secrets, don't track it in Git.
@@ -26,6 +26,10 @@ Open `https://${PROXY_HOSTNAME}/` in your browser and verify that you
 can login the using credentials specified by _BAMBOO_ADMIN_USERNAME_ and
 _BAMBOO_ADMIN_PASSWORD_ in your `.env` file.
 
+If the server is exposed on the internet, please open _Bamboo administration_ >
+_Global permissions_ and disable access for "Anonymuous users" and
+(any) "Logged in users".
+
 Next, have Python 3.8+ installed on MacOS or Linux and create a virtualenv:
 
     python3 -m venv venv

docker-compose.yml

@@ -21,7 +21,13 @@ services:
       - RUN_USER=bamboo
       - RUN_GROUP=bamboo
       - ATL_PROXY_NAME=${PROXY_HOSTNAME}
+      - CATALINA_CONNECTOR_PROXYNAME=${PROXY_HOSTNAME}
       - ATL_PROXY_PORT=${PROXY_PORT}
+      - CATALINA_CONNECTOR_PROXYPORT=${PROXY_PORT}
+      - ATL_PROXY_SCHEME=${PROXY_SCHEME}
+      - CATALINA_CONNECTOR_SCHEME=${PROXY_SCHEME}
+      - ATL_PROXY_SECURE=${PROXY_SECURE}
+      - CATALINA_CONNECTOR_SECURE=${PROXY_SECURE}
       - ATL_AUTOLOGIN_COOKIE_AGE=86400
       - BAMBOO_HOME=/var/atlassian/application-data/bamboo
       - ATL_BROKER_URI=nio://0.0.0.0:54663
@@ -40,7 +46,7 @@ services:
       - ATL_IMPORT_PATH=
       - ATL_FORCE_CFG_UPDATE=true
       - ATL_DB_TYPE=${DB_TYPE}
-      - ATL_JDBC_URL=jdbc:postgresql://bamboo_postgresql:5432/${DB_NAME}
+      - ATL_JDBC_URL=jdbc:postgresql://bamboo_postgresql:${DB_PORT}/${DB_NAME}
       - ATL_JDBC_USER=${DB_USER}
       - ATL_JDBC_PASSWORD=${DB_PASSWORD}
     volumes:
@@ -52,7 +58,7 @@ services:
     container_name: bamboo_postgresql
     ports:
       - target: 5432
-        published: 5432
+        published: ${DB_PORT}
         protocol: tcp
         mode: host
     environment: