From e38118fe09f251e2940953b48558e3b7ede0e4da Mon Sep 17 00:00:00 2001
From: Bryan Brancotte <bryan.brancotte@pasteur.fr>
Date: Thu, 7 Dec 2023 13:20:06 +0100
Subject: [PATCH 01/11] use ebaii theme
---
src/strass/requirements.txt | 1 +
src/strass/strass/settings.py | 1 +
2 files changed, 2 insertions(+)
diff --git a/src/strass/requirements.txt b/src/strass/requirements.txt
index e41eb193..7b35504f 100644
--- a/src/strass/requirements.txt
+++ b/src/strass/requirements.txt
@@ -4,6 +4,7 @@ django-crispy-forms~=2.0
crispy-bootstrap4
python-decouple
git+https://gitlab.pasteur.fr/bbrancot/django-basetheme-bootstrap.git@v1.4
+git+https://gitlab.pasteur.fr/bbrancot/django-basetheme-bootstrap-ebaii-theme.git@1.0
django-formtools
csscompressor
coverage
diff --git a/src/strass/strass/settings.py b/src/strass/strass/settings.py
index 51d6117b..581307d3 100644
--- a/src/strass/strass/settings.py
+++ b/src/strass/strass/settings.py
@@ -49,6 +49,7 @@ INSTALLED_APPS = [
'crispy_forms',
'crispy_bootstrap4',
'strass_app',
+ 'ebaii',
]
if DEBUG or config('USE_DJANGO_EXTENSIONS', default=False, cast=bool):
--
GitLab
From 2aa2186da7f364f42f2c9f5a34faf66af5540fe0 Mon Sep 17 00:00:00 2001
From: Bryan Brancotte <bryan.brancotte@pasteur.fr>
Date: Thu, 7 Dec 2023 14:38:50 +0100
Subject: [PATCH 02/11] update theme
---
src/strass/requirements.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/strass/requirements.txt b/src/strass/requirements.txt
index 9c93ccdd..f20c6fac 100644
--- a/src/strass/requirements.txt
+++ b/src/strass/requirements.txt
@@ -3,8 +3,8 @@ django-extensions
django-crispy-forms~=2.0
crispy-bootstrap4
python-decouple
-git+https://gitlab.pasteur.fr/bbrancot/django-basetheme-bootstrap.git@v1.5
-git+https://gitlab.pasteur.fr/bbrancot/django-basetheme-bootstrap-ebaii-theme.git@1.0
+git+https://gitlab.pasteur.fr/bbrancot/django-basetheme-bootstrap.git@v1.6
+git+https://gitlab.pasteur.fr/bbrancot/django-basetheme-bootstrap-ebaii-theme.git@1.1
django-formtools
csscompressor
coverage
--
GitLab
From 97e5b0e79faf26f550dae6d2de40b51004fff8ac Mon Sep 17 00:00:00 2001
From: Bryan Brancotte <bryan.brancotte@pasteur.fr>
Date: Thu, 11 Jan 2024 11:08:27 +0100
Subject: [PATCH 03/11] commit sha in grey, show start aplication date in call
---
src/strass/requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/strass/requirements.txt b/src/strass/requirements.txt
index ee03e064..1432c33a 100644
--- a/src/strass/requirements.txt
+++ b/src/strass/requirements.txt
@@ -4,7 +4,7 @@ django-crispy-forms~=2.0
crispy-bootstrap4
python-decouple
git+https://gitlab.pasteur.fr/bbrancot/django-basetheme-bootstrap.git@v1.6
-git+https://gitlab.pasteur.fr/bbrancot/django-basetheme-bootstrap-ebaii-theme.git@1.1
+git+https://gitlab.pasteur.fr/bbrancot/django-basetheme-bootstrap-ebaii-theme.git@1.2
django-formtools
csscompressor
coverage
--
GitLab
From ca263e9d2a27bc1d393c30e72062b57612f196d7 Mon Sep 17 00:00:00 2001
From: Bryan Brancotte <bryan.brancotte@pasteur.fr>
Date: Thu, 11 Jan 2024 11:49:37 +0100
Subject: [PATCH 04/11] bugfix, typo in config map name
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0b0b901a..8cadd1e3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -79,7 +79,7 @@ build:
- kubectl get quota
- >
if [[ -z "$PUBLICLY_OPEN" ]]; then
- PUBLICLY_OPEN=$(kubectl get configmap ${REL_NAME}-app -o jsonpath='{.data.PUBLICLY_OPEN}' 2>/dev/null || echo -n "false")
+ PUBLICLY_OPEN=$(kubectl get configmap ${REL_NAME}-strass-app -o jsonpath='{.data.PUBLICLY_OPEN}' 2>/dev/null || echo -n "false")
fi
- >
echo "helm upgrade --install --wait --namespace=${NAMESPACE}
--
GitLab
From fc0ed18a06ad81cf2c5a54eff661d0161eff55ef Mon Sep 17 00:00:00 2001
From: Bryan Brancotte <bryan.brancotte@pasteur.fr>
Date: Fri, 12 Jan 2024 09:24:08 +0100
Subject: [PATCH 05/11] use package instead of sources
---
src/strass/requirements.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/strass/requirements.txt b/src/strass/requirements.txt
index 1bceafd4..75f98ca1 100644
--- a/src/strass/requirements.txt
+++ b/src/strass/requirements.txt
@@ -7,7 +7,8 @@ python-decouple
django-basetheme-bootstrap>=1.6.1
--extra-index-url https://gitlab.pasteur.fr/api/v4/projects/hub%2Fdjango-kubernetes-probes/packages/pypi/simple
django-kubernetes-probes>=1.1
-git+https://gitlab.pasteur.fr/bbrancot/django-basetheme-bootstrap-ebaii-theme.git@1.2
+--extra-index-url https://gitlab.pasteur.fr/api/v4/projects/bbrancot%2Fdjango-basetheme-bootstrap-ebaii-theme/packages/pypi/simple
+django-basetheme-bootstrap-ebaii-theme>=1.2
django-formtools
csscompressor
coverage
--
GitLab
From 5e230014f864653710c08fb61e9b8de7f00dfc21 Mon Sep 17 00:00:00 2001
From: Bryan Brancotte <bryan.brancotte@pasteur.fr>
Date: Fri, 2 Feb 2024 12:40:13 +0100
Subject: [PATCH 06/11] upgrade theme
---
src/strass/requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/strass/requirements.txt b/src/strass/requirements.txt
index 75f98ca1..2c089825 100644
--- a/src/strass/requirements.txt
+++ b/src/strass/requirements.txt
@@ -8,7 +8,7 @@ django-basetheme-bootstrap>=1.6.1
--extra-index-url https://gitlab.pasteur.fr/api/v4/projects/hub%2Fdjango-kubernetes-probes/packages/pypi/simple
django-kubernetes-probes>=1.1
--extra-index-url https://gitlab.pasteur.fr/api/v4/projects/bbrancot%2Fdjango-basetheme-bootstrap-ebaii-theme/packages/pypi/simple
-django-basetheme-bootstrap-ebaii-theme>=1.2
+django-basetheme-bootstrap-ebaii-theme>=1.2.1
django-formtools
csscompressor
coverage
--
GitLab
From 5a561a258761a6bdbb9320c5f17f5e81ca747b7e Mon Sep 17 00:00:00 2001
From: Bryan Brancotte <bryan.brancotte@pasteur.fr>
Date: Tue, 13 Feb 2024 15:02:10 +0100
Subject: [PATCH 07/11] update theme
---
src/strass/requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/strass/requirements.txt b/src/strass/requirements.txt
index 2c089825..86c251b4 100644
--- a/src/strass/requirements.txt
+++ b/src/strass/requirements.txt
@@ -8,7 +8,7 @@ django-basetheme-bootstrap>=1.6.1
--extra-index-url https://gitlab.pasteur.fr/api/v4/projects/hub%2Fdjango-kubernetes-probes/packages/pypi/simple
django-kubernetes-probes>=1.1
--extra-index-url https://gitlab.pasteur.fr/api/v4/projects/bbrancot%2Fdjango-basetheme-bootstrap-ebaii-theme/packages/pypi/simple
-django-basetheme-bootstrap-ebaii-theme>=1.2.1
+django-basetheme-bootstrap-ebaii-theme>=1.3
django-formtools
csscompressor
coverage
--
GitLab
From e5113da77ea31551d44f61b53deac970dcc26550 Mon Sep 17 00:00:00 2001
From: Bryan Brancotte <bryan.brancotte@pasteur.fr>
Date: Mon, 19 Feb 2024 10:07:45 +0100
Subject: [PATCH 08/11] update inserm logo
---
src/strass/requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/strass/requirements.txt b/src/strass/requirements.txt
index 86c251b4..edeceac6 100644
--- a/src/strass/requirements.txt
+++ b/src/strass/requirements.txt
@@ -8,7 +8,7 @@ django-basetheme-bootstrap>=1.6.1
--extra-index-url https://gitlab.pasteur.fr/api/v4/projects/hub%2Fdjango-kubernetes-probes/packages/pypi/simple
django-kubernetes-probes>=1.1
--extra-index-url https://gitlab.pasteur.fr/api/v4/projects/bbrancot%2Fdjango-basetheme-bootstrap-ebaii-theme/packages/pypi/simple
-django-basetheme-bootstrap-ebaii-theme>=1.3
+django-basetheme-bootstrap-ebaii-theme>=1.3.1
django-formtools
csscompressor
coverage
--
GitLab
From f4fe09fef33e2ca32fcad45f13f35e6ff90a7415 Mon Sep 17 00:00:00 2001
From: Bryan Brancotte <bryan.brancotte@pasteur.fr>
Date: Wed, 6 Mar 2024 16:17:42 +0100
Subject: [PATCH 09/11] update theme
---
src/strass/requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/strass/requirements.txt b/src/strass/requirements.txt
index edeceac6..2ac1bb92 100644
--- a/src/strass/requirements.txt
+++ b/src/strass/requirements.txt
@@ -8,7 +8,7 @@ django-basetheme-bootstrap>=1.6.1
--extra-index-url https://gitlab.pasteur.fr/api/v4/projects/hub%2Fdjango-kubernetes-probes/packages/pypi/simple
django-kubernetes-probes>=1.1
--extra-index-url https://gitlab.pasteur.fr/api/v4/projects/bbrancot%2Fdjango-basetheme-bootstrap-ebaii-theme/packages/pypi/simple
-django-basetheme-bootstrap-ebaii-theme>=1.3.1
+django-basetheme-bootstrap-ebaii-theme>=1.3.2
django-formtools
csscompressor
coverage
--
GitLab
From 958e1b7a7fedb8718ccdcc33169fe3b07b684475 Mon Sep 17 00:00:00 2001
From: Bryan Brancotte <bryan.brancotte@pasteur.fr>
Date: Wed, 6 Mar 2024 16:30:32 +0100
Subject: [PATCH 10/11] restore cpu.limite to 2cpu in prod
---
chart/values.prod.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chart/values.prod.yaml b/chart/values.prod.yaml
index 8ff5192d..5a031d8c 100644
--- a/chart/values.prod.yaml
+++ b/chart/values.prod.yaml
@@ -1,7 +1,7 @@
resources:
limits:
memory: "2Gi"
- cpu: "1500m"
+ cpu: "2000m"
isProd: true
--
GitLab
From 400aed22902ff134951730e1bf19ae30ba0b7030 Mon Sep 17 00:00:00 2001
From: Bryan BRANCOTTE <bryan.brancotte@pasteur.fr>
Date: Fri, 8 Mar 2024 16:13:40 +0100
Subject: [PATCH 11/11] Update requirements.txt
---
src/strass/requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/strass/requirements.txt b/src/strass/requirements.txt
index 2ac1bb92..94b6c670 100644
--- a/src/strass/requirements.txt
+++ b/src/strass/requirements.txt
@@ -1,4 +1,4 @@
-django~=4.2.8
+django~=4.2.11
django-extensions
django-crispy-forms~=2.0
crispy-bootstrap4
--
GitLab