diff --git a/apps/gitlab/18.5.1-ce.0/data.yml b/apps/gitlab/18.5.1-ce.0/data.yml new file mode 100644 index 000000000..43858877e --- /dev/null +++ b/apps/gitlab/18.5.1-ce.0/data.yml @@ -0,0 +1,18 @@ +additionalProperties: + formFields: + - default: 8080 + envKey: PANEL_APP_PORT_HTTP + labelEn: HTTP Port + labelZh: HTTP 端口 + random: false + required: true + rule: paramPort + type: number + - default: 8022 + envKey: PANEL_APP_PORT_SSH + labelEn: SSH Port + labelZh: SSH 端口 + random: false + required: true + rule: paramPort + type: number diff --git a/apps/gitlab/18.5.1-ce.0/docker-compose.yml b/apps/gitlab/18.5.1-ce.0/docker-compose.yml new file mode 100644 index 000000000..a0ad08953 --- /dev/null +++ b/apps/gitlab/18.5.1-ce.0/docker-compose.yml @@ -0,0 +1,25 @@ +version: "3.6" +services: + gitlab-jh: + image: gitlab/gitlab-ce:18.3.5-ce.0 + container_name: ${CONTAINER_NAME} + hostname: localhost + restart: always + networks: + - 1panel-network + environment: + GITLAB_OMNIBUS_CONFIG: | + external_url 'http://localhost/' + ports: + - ${PANEL_APP_PORT_HTTP}:80 + - ${PANEL_APP_PORT_SSH}:22 + volumes: + - './config:/etc/gitlab' + - './logs:/var/log/gitlab' + - './data:/var/opt/gitlab' + labels: + createdBy: "Apps" + +networks: + 1panel-network: + external: true diff --git a/apps/gitlab/18.5.1-ee.0/data.yml b/apps/gitlab/18.5.1-ee.0/data.yml index 0fbaab4cb..43858877e 100644 --- a/apps/gitlab/18.5.1-ee.0/data.yml +++ b/apps/gitlab/18.5.1-ee.0/data.yml @@ -9,9 +9,9 @@ additionalProperties: rule: paramPort type: number - default: 8022 - envKey: PANEL_APP_PORT_22 - labelEn: Port 22 in container - labelZh: 容器内的 22 端口 + envKey: PANEL_APP_PORT_SSH + labelEn: SSH Port + labelZh: SSH 端口 random: false required: true rule: paramPort diff --git a/apps/gitlab/18.5.1-ee.0/docker-compose.yml b/apps/gitlab/18.5.1-ee.0/docker-compose.yml index 18a4f1621..14524846e 100644 --- a/apps/gitlab/18.5.1-ee.0/docker-compose.yml +++ b/apps/gitlab/18.5.1-ee.0/docker-compose.yml @@ -12,7 +12,7 @@ services: external_url 'http://localhost/' ports: - ${PANEL_APP_PORT_HTTP}:80 - - ${PANEL_APP_PORT_22}:22 + - ${PANEL_APP_PORT_SSH}:22 volumes: - './config:/etc/gitlab' - './logs:/var/log/gitlab' diff --git a/apps/gitlab/README.md b/apps/gitlab/README.md index fa3dfa8fe..8be608ed9 100644 --- a/apps/gitlab/README.md +++ b/apps/gitlab/README.md @@ -1,5 +1,7 @@ # GitLab +ce 为社区版,ee 为企业版。 + ### 使用建议 - 对于最多 20 个请求每秒或 1,000 个用户,您应该拥有 8 个 vCPU。