From 428ba37bb394d48583e8715037788436634ae271 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Tue, 30 May 2023 11:14:04 +0200
Subject: [PATCH] Use 7555 as devault container in caprover

---
 caprover_create_app.py | 17 +----------------
 caprover_deploy.sh     |  3 +++
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/caprover_create_app.py b/caprover_create_app.py
index d67eb866..549b5b23 100644
--- a/caprover_create_app.py
+++ b/caprover_create_app.py
@@ -70,6 +70,7 @@ def main(app_name, image_name, environment_file):
         force_ssl=True,
         expose_as_web_app=True,
         image_name=image_name,
+        container_http_port=7555,
         environment_variables={
             # 'DJANGO_SETTINGS_MODULE': 'config.settings.base',
             "IT_APP_ENVIRONMENT": env.str("IT_APP_ENVIRONMENT", "caprover_feature"),
@@ -84,25 +85,9 @@ def main(app_name, image_name, environment_file):
             "IT_DJANGO_SECRET_KEY": env.str(
                 "IT_DJANGO_SECRET_KEY", generate_random_string(63)
             ),
-            "IT_DJANGO_ADMIN_URL": env.str("IT_DJANGO_ADMIN_URL", "admin/"),
             "IT_DJANGO_DEBUG": "false",
             "IT_SERVE_VUE": "false",
             "IT_ALLOW_LOCAL_LOGIN": "true",
-            # used for deployment of "real" environments, not used now for feature branches
-            # 'IT_ALLOW_LOCAL_LOGIN': env.str('IT_ALLOW_LOCAL_LOGIN'),
-            # 'IT_SENTRY_DSN': env.str('IT_SENTRY_DSN'),
-            # 'IT_OAUTH_CLIENT_NAME': env.str('IT_OAUTH_CLIENT_NAME'),
-            # 'IT_OAUTH_CLIENT_ID': env.str('IT_OAUTH_CLIENT_ID'),
-            # 'IT_OAUTH_CLIENT_SECRET': env.str('IT_OAUTH_CLIENT_SECRET'),
-            # 'IT_OAUTH_ACCESS_TOKEN_URL': env.str('IT_OAUTH_ACCESS_TOKEN_URL'),
-            # 'IT_OAUTH_AUTHORIZE_URL': env.str('IT_OAUTH_AUTHORIZE_URL'),
-            # 'IT_OAUTH_API_BASE_URL': env.str('IT_OAUTH_API_BASE_URL'),
-            # 'IT_OAUTH_LOCAL_DIRECT_URI': env.str('IT_OAUTH_LOCAL_DIRECT_URI'),
-            # 'IT_OAUTH_TENANT_ID': env.str('IT_OAUTH_TENANT_ID'),
-            # 'IT_OAUTH_SCOPE': env.str('IT_OAUTH_SCOPE'),
-            # 'IT_OAUTH_SERVER_METADATA_URL': env.str('IT_OAUTH_SERVER_METADATA_URL'),
-            # 'IT_OAUTH_TOKEN_NAME': env.str('IT_OAUTH_TOKEN_NAME'),
-            # 'IT_OAUTH_LOGOUT_URL': env.str('IT_OAUTH_LOGOUT_URL'),
         },
     )
 
diff --git a/caprover_deploy.sh b/caprover_deploy.sh
index f31cdba0..57beb7c5 100755
--- a/caprover_deploy.sh
+++ b/caprover_deploy.sh
@@ -14,6 +14,8 @@ BRANCH_NAME_SLUG=$(echo "$BRANCH_NAME" | sed -e 's/[^[:alnum:]]/-/g' | tr -s '-'
 echo "$BRANCH_NAME_SLUG"
 
 DEFAULT_APP_NAME="vbv-$BRANCH_NAME_SLUG"
+
+# take app name as first argument or use default generated app name
 APP_NAME=${1:-$DEFAULT_APP_NAME}
 
 # shorten APP_NAME to 32 characters
@@ -57,6 +59,7 @@ python server/manage.py collectstatic --no-input
 docker build --platform=linux/amd64 -f compose/django/Dockerfile -t "$REPO" -t "$LATEST" -t "$VERSION_TAG" --build-arg VERSION="$VERSION" --build-arg BUILD_TIMESTAMP="$BUILD_TIMESTAMP" --build-arg GIT_COMMIT="$(git log -1 --format=%h)" .
 docker push "$VERSION_TAG"
 
+# caprover specific stuff
 APP_URL="$APP_NAME.control.iterativ.ch"
 
 echo "Checking if $APP_URL is available..."