From 406b7f46e506c27783faa86d3ce927e70c31ecd7 Mon Sep 17 00:00:00 2001 From: erickriegel <100199333+erickriegel@users.noreply.github.com> Date: Mon, 18 Nov 2024 08:56:48 +0100 Subject: [PATCH 1/5] Update forge-gitlab.nomad.tpl --- gitlab/forge-gitlab.nomad.tpl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gitlab/forge-gitlab.nomad.tpl b/gitlab/forge-gitlab.nomad.tpl index 209bca7..8cffe53 100644 --- a/gitlab/forge-gitlab.nomad.tpl +++ b/gitlab/forge-gitlab.nomad.tpl @@ -160,6 +160,9 @@ gitlab_rails['gitlab_email_reply_to'] = 'noreply@esante.gouv.fr' extra_hosts = [ "jenkins.internal:$\u007Battr.unique.network.ip-address\u007D" ] image = "${image}:${tag}.${tag_patch}${tag_suffixe}" + args = [ + "--shm-size", "256m" + ] ports = ["gitlab", "gitlab-https", "gitlab-ssh"] volumes = ["name=forge-gitlab-data,io_priority=high,size=40,repl=2:/var/opt/gitlab", "name=forge-gitlab-logs,io_priority=high,size=2,repl=2:/var/log/gitlab", From 79f645f28e67287a6f60499e9344bf15d940fb8c Mon Sep 17 00:00:00 2001 From: erickriegel <100199333+erickriegel@users.noreply.github.com> Date: Mon, 18 Nov 2024 09:21:30 +0100 Subject: [PATCH 2/5] Update forge-gitlab.nomad.tpl --- gitlab/forge-gitlab.nomad.tpl | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gitlab/forge-gitlab.nomad.tpl b/gitlab/forge-gitlab.nomad.tpl index 8cffe53..a648982 100644 --- a/gitlab/forge-gitlab.nomad.tpl +++ b/gitlab/forge-gitlab.nomad.tpl @@ -160,9 +160,7 @@ gitlab_rails['gitlab_email_reply_to'] = 'noreply@esante.gouv.fr' extra_hosts = [ "jenkins.internal:$\u007Battr.unique.network.ip-address\u007D" ] image = "${image}:${tag}.${tag_patch}${tag_suffixe}" - args = [ - "--shm-size", "256m" - ] + shm-size = 256m ports = ["gitlab", "gitlab-https", "gitlab-ssh"] volumes = ["name=forge-gitlab-data,io_priority=high,size=40,repl=2:/var/opt/gitlab", "name=forge-gitlab-logs,io_priority=high,size=2,repl=2:/var/log/gitlab", From ec2109e73cf47022bb4da38fc8b9e8f65e9efbd0 Mon Sep 17 00:00:00 2001 From: erickriegel <100199333+erickriegel@users.noreply.github.com> Date: Mon, 18 Nov 2024 09:23:00 +0100 Subject: [PATCH 3/5] Update forge-gitlab.nomad.tpl --- gitlab/forge-gitlab.nomad.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitlab/forge-gitlab.nomad.tpl b/gitlab/forge-gitlab.nomad.tpl index a648982..b08caf2 100644 --- a/gitlab/forge-gitlab.nomad.tpl +++ b/gitlab/forge-gitlab.nomad.tpl @@ -160,7 +160,7 @@ gitlab_rails['gitlab_email_reply_to'] = 'noreply@esante.gouv.fr' extra_hosts = [ "jenkins.internal:$\u007Battr.unique.network.ip-address\u007D" ] image = "${image}:${tag}.${tag_patch}${tag_suffixe}" - shm-size = 256m + shm-size = "256m" ports = ["gitlab", "gitlab-https", "gitlab-ssh"] volumes = ["name=forge-gitlab-data,io_priority=high,size=40,repl=2:/var/opt/gitlab", "name=forge-gitlab-logs,io_priority=high,size=2,repl=2:/var/log/gitlab", From 3305d4e49fc604ba7dfb64192edd88a6f4575632 Mon Sep 17 00:00:00 2001 From: erickriegel <100199333+erickriegel@users.noreply.github.com> Date: Mon, 18 Nov 2024 09:25:15 +0100 Subject: [PATCH 4/5] Update forge-gitlab.nomad.tpl --- gitlab/forge-gitlab.nomad.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitlab/forge-gitlab.nomad.tpl b/gitlab/forge-gitlab.nomad.tpl index b08caf2..2869cc7 100644 --- a/gitlab/forge-gitlab.nomad.tpl +++ b/gitlab/forge-gitlab.nomad.tpl @@ -160,7 +160,7 @@ gitlab_rails['gitlab_email_reply_to'] = 'noreply@esante.gouv.fr' extra_hosts = [ "jenkins.internal:$\u007Battr.unique.network.ip-address\u007D" ] image = "${image}:${tag}.${tag_patch}${tag_suffixe}" - shm-size = "256m" + shm_size = "256m" ports = ["gitlab", "gitlab-https", "gitlab-ssh"] volumes = ["name=forge-gitlab-data,io_priority=high,size=40,repl=2:/var/opt/gitlab", "name=forge-gitlab-logs,io_priority=high,size=2,repl=2:/var/log/gitlab", From df94b9e76b71b41d702be1f02b82253639c59d96 Mon Sep 17 00:00:00 2001 From: erickriegel <100199333+erickriegel@users.noreply.github.com> Date: Mon, 18 Nov 2024 09:27:04 +0100 Subject: [PATCH 5/5] Update forge-gitlab.nomad.tpl --- gitlab/forge-gitlab.nomad.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitlab/forge-gitlab.nomad.tpl b/gitlab/forge-gitlab.nomad.tpl index 2869cc7..52f3e70 100644 --- a/gitlab/forge-gitlab.nomad.tpl +++ b/gitlab/forge-gitlab.nomad.tpl @@ -160,7 +160,7 @@ gitlab_rails['gitlab_email_reply_to'] = 'noreply@esante.gouv.fr' extra_hosts = [ "jenkins.internal:$\u007Battr.unique.network.ip-address\u007D" ] image = "${image}:${tag}.${tag_patch}${tag_suffixe}" - shm_size = "256m" + shm_size = 268435456 ports = ["gitlab", "gitlab-https", "gitlab-ssh"] volumes = ["name=forge-gitlab-data,io_priority=high,size=40,repl=2:/var/opt/gitlab", "name=forge-gitlab-logs,io_priority=high,size=2,repl=2:/var/log/gitlab",