coop-cloud/gitlab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: coop-cloud:master
Branches Tags
coop-cloud:master
coop-cloud:runner
coop-cloud:0.1.3+17.7.3-ce.0
coop-cloud:0.1.2+17.7.3-ce.0
coop-cloud:0.1.1+17.7.0-ce.0
coop-cloud:0.1.0+17.5.4-ce.0
coop-cloud:0.1.0+17.7.0-ce.0
..
compare: coop-cloud:runner
Branches Tags
coop-cloud:master
coop-cloud:runner
coop-cloud:0.1.3+17.7.3-ce.0
coop-cloud:0.1.2+17.7.3-ce.0
coop-cloud:0.1.1+17.7.0-ce.0
coop-cloud:0.1.0+17.5.4-ce.0
coop-cloud:0.1.0+17.7.0-ce.0

No commits in common. "master" and "runner" have entirely different histories.
master ... runner

3 changed files with 2 additions and 3 deletions
Show Stats Expand all files Collapse all files

2
compose.yml
View File

@ -34,7 +34,7 @@ services:
- "backupbot.backup=true" - "backupbot.backup=true"
- "backupbot.backup.path=/etc/gitlab/,/var/log/gitlab/,/var/opt/gitlab/" - "backupbot.backup.path=/etc/gitlab/,/var/log/gitlab/,/var/opt/gitlab/"
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-240}" - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-240}"
- "coop-cloud.${STACK_NAME}.version=0.1.3+17.7.3-ce.0" - "coop-cloud.${STACK_NAME}.version=0.1.2+17.7.3-ce.0"
secrets: secrets:
- initial_root_password - initial_root_password
- runner_token - runner_token

2
gitlab.rb.tmpl
View File

@ -678,7 +678,7 @@ gitlab_rails['omniauth_providers'] = [
# high_availability['mountpoint'] = ["/var/opt/gitlab/git-data", "/var/opt/gitlab/gitlab-rails/shared"] # high_availability['mountpoint'] = ["/var/opt/gitlab/git-data", "/var/opt/gitlab/gitlab-rails/shared"]
### GitLab Shell settings for GitLab ### GitLab Shell settings for GitLab
gitlab_rails['gitlab_shell_ssh_port'] = {{ env "GITLAB_SSH_PORT" }} # gitlab_rails['gitlab_shell_ssh_port'] = 22
# gitlab_rails['gitlab_shell_git_timeout'] = 800 # gitlab_rails['gitlab_shell_git_timeout'] = 800
### Enable gitlab-sshd on a different port than OpenSSH ### Enable gitlab-sshd on a different port than OpenSSH

1
release/0.1.3+17.7.3-ce.0
View File

@ -1 +0,0 @@
Fixes bug where GITLAB_SSH_PORT was not set in the Gitlab config