From 424f1132bd73047d64fbcc97f6d6b4ebbd70bd47 Mon Sep 17 00:00:00 2001
From: pooneyy <85266337+pooneyy@users.noreply.github.com>
Date: Tue, 7 Oct 2025 23:28:13 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(gitlab):=20update=20to=20versi?=
 =?UTF-8?q?on=2018.4.0=20and=20add=20system=20requirements?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- upgrade gitlab-jh from version 18.3.1-jh.0 to 18.4.0-jh.0
- system requirementsadd memory requirement specification (2560 MB)
- system requirements add architecture support for both amd64 and arm64
- update docker-compose configuration with new version
---
 apps/gitlab-jh/{18.3.1-jh.0 => 18.4.0}/data.yml           | 0
 apps/gitlab-jh/{18.3.1-jh.0 => 18.4.0}/docker-compose.yml | 2 +-
 apps/gitlab-jh/data.yml                                   | 4 ++++
 apps/gitlab/data.yml                                      | 4 ++++
 4 files changed, 9 insertions(+), 1 deletion(-)
 rename apps/gitlab-jh/{18.3.1-jh.0 => 18.4.0}/data.yml (100%)
 rename apps/gitlab-jh/{18.3.1-jh.0 => 18.4.0}/docker-compose.yml (89%)

diff --git a/apps/gitlab-jh/18.3.1-jh.0/data.yml b/apps/gitlab-jh/18.4.0/data.yml
similarity index 100%
rename from apps/gitlab-jh/18.3.1-jh.0/data.yml
rename to apps/gitlab-jh/18.4.0/data.yml
diff --git a/apps/gitlab-jh/18.3.1-jh.0/docker-compose.yml b/apps/gitlab-jh/18.4.0/docker-compose.yml
similarity index 89%
rename from apps/gitlab-jh/18.3.1-jh.0/docker-compose.yml
rename to apps/gitlab-jh/18.4.0/docker-compose.yml
index 840a3e06e..255ad2248 100644
--- a/apps/gitlab-jh/18.3.1-jh.0/docker-compose.yml
+++ b/apps/gitlab-jh/18.4.0/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3.6" 
 services: 
   gitlab-jh: 
-    image: registry.gitlab.cn/omnibus/gitlab-jh:18.3.1-jh.0
+    image: registry.gitlab.cn/omnibus/gitlab-jh:18.4.0-jh.0
     container_name: ${CONTAINER_NAME}
     hostname: localhost
     restart: always
diff --git a/apps/gitlab-jh/data.yml b/apps/gitlab-jh/data.yml
index a76313630..283c5a55d 100644
--- a/apps/gitlab-jh/data.yml
+++ b/apps/gitlab-jh/data.yml
@@ -11,3 +11,7 @@ additionalProperties:
   website: https://gitlab.cn/
   github: https://gitlab.cn/
   document: https://gitlab.cn/docs/jh/
+  memoryRequired: 2560
+  architectures:
+    - amd64
+    - arm64
diff --git a/apps/gitlab/data.yml b/apps/gitlab/data.yml
index 546086dd0..cf8eeeae1 100644
--- a/apps/gitlab/data.yml
+++ b/apps/gitlab/data.yml
@@ -11,3 +11,7 @@ additionalProperties:
   website: https://about.gitlab.com/
   github: https://about.gitlab.com/
   document: https://docs.gitlab.com/user/get_started/
+  memoryRequired: 2560
+  architectures:
+    - amd64
+    - arm64