From c92fee78e2bf19d2a34986ee68316c8278101d77 Mon Sep 17 00:00:00 2001
From: Ariel Rin <ozirascal@gmail.com>
Date: Wed, 8 Nov 2023 20:01:07 +1000
Subject: [PATCH 1/3] add superlance/memmon path to the bootstrap

---
 allianceauth/bin/allianceauth.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/allianceauth/bin/allianceauth.py b/allianceauth/bin/allianceauth.py
index ee2f9ea0..0ab75d8b 100644
--- a/allianceauth/bin/allianceauth.py
+++ b/allianceauth/bin/allianceauth.py
@@ -12,6 +12,7 @@ class StartProject(BaseStartProject):
         parser.add_argument('--python', help='The path to the python executable.')
         parser.add_argument('--celery', help='The path to the celery executable.')
         parser.add_argument('--gunicorn', help='The path to the gunicorn executable.')
+        parser.add_argument('--memmon', help='The path to the memmon executable.')
 
 
 def create_project(parser, options, args):

From 7e312bb95fb2464ddc157797085d3f5912dd94ce Mon Sep 17 00:00:00 2001
From: Ariel Rin <ozirascal@gmail.com>
Date: Wed, 8 Nov 2023 20:25:24 +1000
Subject: [PATCH 2/3] four args now

---
 allianceauth/bin/allianceauth.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allianceauth/bin/allianceauth.py b/allianceauth/bin/allianceauth.py
index 0ab75d8b..20cfb53d 100644
--- a/allianceauth/bin/allianceauth.py
+++ b/allianceauth/bin/allianceauth.py
@@ -19,7 +19,7 @@ def create_project(parser, options, args):
     # Validate args
     if len(args) < 2:
         parser.error("Please specify a name for your Alliance Auth installation.")
-    elif len(args) > 3:
+    elif len(args) > 4:
         parser.error("Too many arguments.")
 
     # First find the path to Alliance Auth

From 03be66d11f8d933b29b0b55fe4afcab3f75ef171 Mon Sep 17 00:00:00 2001
From: Ariel Rin <ozirascal@gmail.com>
Date: Wed, 8 Nov 2023 23:26:12 +1000
Subject: [PATCH 3/3] multilines dont work in our yaml

---
 .gitlab-ci.yml | 27 ++++-----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 95398f63..da60688e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -223,7 +223,7 @@ test-docs:
   <<: *only-default
   image: python:3.11-bullseye
   script:
-  - tox -e docs
+    - tox -e docs
 
 deploy_production:
   stage: deploy
@@ -259,16 +259,7 @@ build-image:
     docker run --privileged --rm tonistiigi/binfmt --uninstall qemu-*
     docker run --privileged --rm tonistiigi/binfmt --install all
     docker buildx create --use --name new-builder
-    docker buildx build .
-      --tag $IMAGE_TAG
-      --tag $CURRENT_TAG
-      --tag $MINOR_TAG
-      --tag $MAJOR_TAG
-      --tag $LATEST_TAG
-      --file docker/Dockerfile
-      --platform linux/amd64,linux/arm64
-      --push
-      --build-arg AUTH_VERSION=$(echo $CI_COMMIT_TAG | cut -c 2-)
+    docker buildx build . --tag $IMAGE_TAG --tag $CURRENT_TAG --tag $MINOR_TAG --tag $MAJOR_TAG --tag $LATEST_TAG --file docker/Dockerfile --platform linux/amd64,linux/arm64 --push --build-arg AUTH_VERSION=$(echo $CI_COMMIT_TAG | cut -c 2-)
   rules:
     - if: $CI_COMMIT_TAG
       when: delayed
@@ -288,12 +279,7 @@ build-image-dev:
     docker run --privileged --rm tonistiigi/binfmt --uninstall qemu-*
     docker run --privileged --rm tonistiigi/binfmt --install all
     docker buildx create --use --name new-builder
-    docker buildx build .
-      --tag $IMAGE_TAG
-      --file docker/Dockerfile
-      --platform linux/amd64,linux/arm64
-      --push
-      --build-arg AUTH_PACKAGE=git+https://gitlab.com/allianceauth/allianceauth@$CI_COMMIT_BRANCH
+    docker buildx build . --tag $IMAGE_TAG --file docker/Dockerfile --platform linux/amd64,linux/arm64 --push --build-arg AUTH_PACKAGE=git+https://gitlab.com/allianceauth/allianceauth@$CI_COMMIT_BRANCH
   rules:
     - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == ""'
       when: manual
@@ -314,12 +300,7 @@ build-image-mr:
     docker run --privileged --rm tonistiigi/binfmt --uninstall qemu-*
     docker run --privileged --rm tonistiigi/binfmt --install all
     docker buildx create --use --name new-builder
-    docker buildx build .
-    --tag $IMAGE_TAG
-    --file docker/Dockerfile
-    --platform linux/amd64,linux/arm64
-    --push
-    --build-arg AUTH_PACKAGE=git+$CI_MERGE_REQUEST_SOURCE_PROJECT_URL@$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
+    docker buildx build . --tag $IMAGE_TAG --file docker/Dockerfile --platform linux/amd64,linux/arm64 --push --build-arg AUTH_PACKAGE=git+$CI_MERGE_REQUEST_SOURCE_PROJECT_URL@$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
   rules:
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
       when: manual