Skip to content

Commit

Permalink
gitlab finished
Browse files Browse the repository at this point in the history
  • Loading branch information
Administrator committed Feb 3, 2017
1 parent baab4a7 commit bb4706e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions gitlab/gitlab-runner/gitlab-runner-docker-configmap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ data:
[[runners]]
name = "gitlab-docker-runner"
url = "http://gitlab.gitlab/ci"
token = "a2c668d104311cac37c5615701f9e9"
token = "054e7f268a1a11a77cd1d116770cbc"
executor = "docker"
[runners.docker]
tls_verify = false
Expand All @@ -22,6 +22,6 @@ data:
[runners.cache]
Type = "s3"
ServerAddress = "http://minio.gitlab/"
AccessKey = "NAQDF9PGV6IN6OUA1AWQ"
SecretKey = "aqaDEnG1bMHJ9y4L3KjstZzMcG9d7vRgSJg28B1X"
AccessKey = "YVC2Z5XE20D9Y43HL7TI"
SecretKey = "tRKQjEyL1e3Nv3QbpjklaLJNa/NfNyy/V5cXG3Dv"
BucketName = "runner"
8 changes: 4 additions & 4 deletions gitlab/gitlab/gitlab-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,16 @@ spec:
value: nXJJ358Qnci0yF9qpAsLrF2vImaoFR03

- name: GITLAB_ROOT_PASSWORD
value: root
value: rootpassword
- name: GITLAB_ROOT_EMAIL
value: root@example.com
value: root@satoshi.tech

- name: GITLAB_HOST
value: git.example.com
value: gitlab.satoshi.tech
- name: GITLAB_PORT
value: "80"
- name: GITLAB_SSH_HOST
value: "ssh-git.example.com"
value: "ssh-gitlab.satoshi.tech"
- name: GITLAB_SSH_PORT
value: "1022"

Expand Down

0 comments on commit bb4706e

Please sign in to comment.