update gitlab to latest version (#343)
* update gitlab to latest version This should refer to the offical docker compose file of gitlab: https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/docker/docker-compose.yml * added option to select gitlab external_url prefix This is needed so that rancher will put a correct uri scheme prefix to the ${gitlab_hostname} to the external_url. * added external_url prefix honestly i don't know if `${gitlab_omnipus_prefix}${gitlab_hostname}` will work since i cannot test it by myself right now, but imo that should work.... * changed version to latest since image is going to be gitlab/gitlab-ce:latest, the version here inside the readme should reflect this. * update to latest
This commit is contained in:
parent
4629ad81ce
commit
70dea3d980
@ -2,7 +2,7 @@
|
||||
|
||||
GitLab CE is a free alternative to GitHub
|
||||
|
||||
Stack based on official GitLab version: 8.5.1-ce.0
|
||||
Stack based on official GitLab version: latest
|
||||
|
||||
https://hub.docker.com/r/gitlab/gitlab-ce/
|
||||
|
||||
|
@ -6,9 +6,12 @@ gitlab-server:
|
||||
labels:
|
||||
io.rancher.sidekicks: gitlab-data
|
||||
hostname: ${gitlab_hostname}
|
||||
image: gitlab/gitlab-ce:8.5.1-ce.0
|
||||
image: gitlab/gitlab-ce:latest
|
||||
volumes_from:
|
||||
- gitlab-data
|
||||
environment:
|
||||
GITLAB_OMNIBUS_CONFIG: |
|
||||
external_url '${gitlab_omnipus_prefix}${gitlab_hostname}'
|
||||
|
||||
gitlab-data:
|
||||
labels:
|
||||
@ -16,7 +19,7 @@ gitlab-data:
|
||||
entrypoint:
|
||||
- /bin/true
|
||||
hostname: gitdata
|
||||
image: gitlab/gitlab-ce:8.5.1-ce.0
|
||||
image: gitlab/gitlab-ce:latest
|
||||
volumes:
|
||||
- /etc/gitlab
|
||||
- /var/log/gitlab
|
||||
|
@ -1,6 +1,6 @@
|
||||
.catalog:
|
||||
name: Gitlab Community
|
||||
version: 8.5.1-0
|
||||
version: latest
|
||||
description: |
|
||||
Gitlab CE is a free GitHub alternative
|
||||
minimum_rancher_version: v0.56.0
|
||||
@ -8,11 +8,21 @@
|
||||
uuid: gitlab-0
|
||||
questions:
|
||||
- variable: "gitlab_hostname"
|
||||
description: "Gitlab hostname"
|
||||
description: "Gitlab hostname (without uri scheme http:// or https://)"
|
||||
label: "Hostname:"
|
||||
required: true
|
||||
default: "git.example.com"
|
||||
type: "string"
|
||||
- variable: "gitlab_omnipus_prefix"
|
||||
label: "Gitlab external_url prefix:"
|
||||
description: |
|
||||
This is needed for the docker-compose file to set the correct external_url
|
||||
default: 'https://'
|
||||
required: true
|
||||
type: "string"
|
||||
options:
|
||||
- 'https://'
|
||||
- 'http://'
|
||||
- variable: "http_port"
|
||||
description: "HTTP port to expose on host. Will be used to bind TCP"
|
||||
label: "HTTP port:"
|
||||
|
@ -1,5 +1,5 @@
|
||||
name: Gitlab Community
|
||||
description: |
|
||||
Gitlab CE is a free GitHub alternative
|
||||
version: 8.5.1-0
|
||||
version: latest
|
||||
category: Versioning
|
||||
|
Loading…
x
Reference in New Issue
Block a user