Skip to content

Commit dfa5a61

Browse files
taomareetaomaree
committed
Merge branch 'master' of https://github.com/sameersbn/docker-gitlab into custom_hooks_dir
2 parents e31a48e + fb38970 commit dfa5a61

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1521
-595
lines changed

‎.circleci/config.yml‎

Lines changed: 308 additions & 69 deletions
Large diffs are not rendered by default.

‎.github/stale.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Number of days of inactivity before an issue becomes stale
2+
daysUntilStale: 60
3+
# Number of days of inactivity before a stale issue is closed
4+
daysUntilClose: 7
5+
# Issues with these labels will never be considered stale
6+
exemptLabels:
7+
- pinned
8+
- security
9+
- keep-alive
10+
# Label to use when marking an issue as stale
11+
staleLabel: wontfix
12+
# Comment to post when marking an issue as stale. Set to `false` to disable
13+
markComment: >
14+
This issue has been automatically marked as stale because it has not had
15+
any activity for the last 60 days. It will be closed if no further activity
16+
occurs during the next 7 days. Thank you for your contributions.
17+
# Comment to post when closing a stale issue. Set to `false` to disable
18+
closeComment: false

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
*.gem
22
*.tar.gz
3-
3+
*.tar.bz2

‎.gitlab-ci.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ before_script:
77
- export VERSION=$(cat VERSION)
88
- export CI_REGISTRY=${CI_REGISTRY:-hub.docker.com}
99
- export CI_REGISTRY_USER=${CI_REGISTRY_USER:-gitlab-ci-token}
10-
- export CI_REGISTRY_PASS=${CI_REGISTRY_PASS:-${CI_JOB_TOKEN}}
10+
- export CI_REGISTRY_PASSWORD=${CI_REGISTRY_PASSWORD:-${CI_JOB_TOKEN}}
1111
- export DOCKER_IMAGE=${DOCKER_IMAGE:-${CI_REGISTRY}/${CI_PROJECT_PATH}}
1212
- |
1313
if [ "${DOCKER_IMAGE}" = "/" ]; then
@@ -19,7 +19,7 @@ docker:build:
1919
only:
2020
- master
2121
script:
22-
- docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASS} ${CI_REGISTRY}
22+
- docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
2323
- docker build
2424
--pull
2525
--cache-from=${DOCKER_IMAGE}
@@ -35,7 +35,7 @@ docker:build:branches:
3535
except:
3636
- master
3737
script:
38-
- docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASS} ${CI_REGISTRY}
38+
- docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
3939
- docker build
4040
--pull
4141
--cache-from=${DOCKER_IMAGE}:${CI_COMMIT_REF_SLUG}
@@ -49,7 +49,7 @@ docker:build:release:
4949
only:
5050
- tags
5151
script:
52-
- docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASS} ${CI_REGISTRY}
52+
- docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
5353
- docker build
5454
--pull
5555
--cache-from=${DOCKER_IMAGE}:${VERSION}

‎CONTRIBUTING.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ When using your own gitlab instance, the provided .gitlab-ci.yml will be automat
44

55
Overrides for these values can be set within the project, under `Settings` -> `CI/CD` -> `Variables`.
66

7-
| Variable | Default Value | Description |
8-
| ------------------ | ------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
9-
| `CI_REGISTRY` | `hub.docker.com` | If available this will be automatically overriden by registry address which is configured within the GitLab instance |
10-
| `CI_REGISTRY_USER` | `gitlab-ci-token` | Username for the registry |
11-
| `CI_REGISTRY_PASS` | `${CI_JOB_TOKEN}` | Password for the registry |
12-
| `DOCKER_IMAGE` | `sameersbn/gitlab` | Docker image name, will be automatically be overriden by the running GitLab instance with the `${CI_PROJECT_PATH}` variable. This will case the image to be uploaded to the local registry of the project within GitLab. |
7+
| Variable | Default Value | Description |
8+
| ---------------------- | ------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
9+
| `CI_REGISTRY` | `hub.docker.com` | If available this will be automatically overriden by registry address which is configured within the GitLab instance |
10+
| `CI_REGISTRY_USER` | `gitlab-ci-token` | Username for the registry |
11+
| `CI_REGISTRY_PASSWORD` | `${CI_JOB_TOKEN}` | Password for the registry |
12+
| `DOCKER_IMAGE` | `sameersbn/gitlab` | Docker image name, will be automatically be overriden by the running GitLab instance with the `${CI_PROJECT_PATH}` variable. This will case the image to be uploaded to the local registry of the project within GitLab. |

‎Changelog.md‎

Lines changed: 267 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,272 @@
11
# Changelog
22

33
This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](
4-
https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab.
4+
https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
5+
6+
**12.9.4**
7+
- gitlab: upgrade CE to v12.9.4
8+
- Update gitlab-workhorse to 8.25.2
9+
- Update golang to 1.13.10
10+
11+
**12.9.2**
12+
- gitlab: upgrade CE to v12.9.2
13+
14+
**12.9.1**
15+
- gitlab: upgrade CE to v12.9.1
16+
17+
**12.9.0**
18+
- gitlab: upgrade CE to v12.9.0
19+
- replaced unicorn with puma
20+
- Removed `UNICORN_WORKERS`
21+
- Removed `UNICORN_TIMEOUT`
22+
- Added `PUMA_THREADS_MIN`
23+
- Added `PUMA_THREADS_MAX`
24+
- Added `PUMA_WORKERS`
25+
- Added `PUMA_TIMEOUT`
26+
27+
**12.8.8**
28+
- gitlab: upgrade CE to v12.8.8
29+
30+
**12.8.7**
31+
- gitlab: upgrade CE to v12.8.7
32+
33+
**12.8.6**
34+
- gitlab: upgrade CE to v12.8.6
35+
36+
**12.8.5**
37+
- gitlab: upgrade CE to v12.8.5
38+
39+
**12.8.4**
40+
- gitlab: upgrade CE to v12.8.4
41+
42+
**12.8.3**
43+
- gitlab: upgrade CE to v12.8.3
44+
45+
**12.8.2**
46+
- gitlab: upgrade CE to v12.8.2
47+
48+
**12.8.1**
49+
- gitlab: upgrade CE to v12.8.1
50+
51+
**12.8.0**
52+
- gitlab: upgrade CE to v12.8.0
53+
- fix: ArgumentError: 'import/{{oauth2_generic_name}}' is not supported [#2101](https://github.com/sameersbn/docker-gitlab/issues/2101)
54+
55+
**12.7.8**
56+
- Upgrade GitLab CE to 12.7.8
57+
58+
**12.7.7**
59+
- Upgrade GitLab CE to 12.7.7
60+
- Add Generic OAuth Provider PR#2070
61+
62+
**12.7.7**
63+
- Upgrade GitLab CE to 12.7.7
64+
65+
**12.7.6**
66+
- gitlab: upgrade CE to v12.7.6
67+
68+
**12.7.5**
69+
- gitlab: upgrade CE to v12.7.5
70+
71+
**12.7.4**
72+
- Upgrade GitLab CE to 12.7.4
73+
- Update golang to 1.13.7
74+
- Update gitlab-pages to 1.15.0
75+
- Update gitlab-workhorse to 8.20.0
76+
- Update gitaly to 1.85.0
77+
78+
**12.7.2**
79+
- Upgrade GitLab CE to 12.7.2
80+
81+
**12.7.0**
82+
- Update gitlab-shell to 11.0.0
83+
- Upgrade GitLab CE to 12.7.0
84+
- Update golang to 1.13.6
85+
- Update gitaly to 1.83.0
86+
- Update gitlab-pages to 1.14.0
87+
- Update gitlab-workhorse to 8.19.0
88+
89+
**12.6.4**
90+
- gitlab: upgrade CE to v12.6.4
91+
92+
**12.6.3**
93+
- gitlab: upgrade CE to v12.6.3
94+
95+
**12.6.2**
96+
- gitlab: upgrade CE to v12.6.2
97+
98+
**12.6.1**
99+
- gitlab: upgrade CE to v12.6.1
100+
101+
**12.6.0**
102+
- gitlab: upgrade CE to v12.6.0
103+
104+
**12.5.7**
105+
- gitlab: upgrade CE to v12.5.7
106+
107+
**12.5.6**
108+
- gitlab: upgrade CE to v12.5.6
109+
110+
**12.5.5**
111+
- gitlab: upgrade CE to v12.5.5
112+
113+
**12.5.4**
114+
- gitlab: upgrade CE to v12.5.4
115+
- Update golang to 1.12.14
116+
117+
**12.5.3**
118+
- gitlab: upgrade CE to v12.5.3
119+
120+
**12.5.2**
121+
- gitlab: upgrade CE to v12.5.2
122+
123+
**12.5.1**
124+
- gitlab: upgrade CE to v12.5.1
125+
126+
**12.5.0**
127+
- gitlab: upgrade CE to v12.5.0
128+
129+
**12.4.3**
130+
- gitlab: upgrade CE to v12.4.3
131+
132+
**12.4.2**
133+
- gitlab: upgrade CE to v12.4.2
134+
135+
**12.4.1**
136+
- gitlab: upgrade CE to v12.4.1
137+
138+
**12.4.0**
139+
- gitlab: upgrade CE to v12.4.0
140+
141+
**12.3.5**
142+
- gitlab: upgrade CE to v12.3.5
143+
144+
**12.3.4**
145+
- gitlab: upgrade CE to v12.3.4
146+
147+
**12.3.3**
148+
- gitlab: upgrade CE to v12.3.3
149+
150+
**12.3.2**
151+
- gitlab: upgrade CE to v12.3.2
152+
153+
**12.3.1**
154+
- gitlab: upgrade CE to v12.3.1
155+
156+
**12.3.0**
157+
- gitlab: upgrade CE to v12.3.0
158+
159+
**12.2.5**
160+
- gitlab: upgrade CE to v12.2.5
161+
162+
**12.2.4**
163+
- gitlab: upgrade CE to v12.2.4
164+
165+
**12.2.3**
166+
- gitlab: upgrade CE to v12.2.3
167+
168+
**12.2.1**
169+
- gitlab: upgrade CE to v12.2.1
170+
171+
**12.2.0**
172+
- gitlab: upgrade CE to v12.2.0
173+
- upgrade base image to ubuntu:bionic
174+
175+
**12.1.6**
176+
- gitlab: upgrade CE to v12.1.6
177+
178+
**12.1.4**
179+
- gitlab: upgrade CE to v12.1.4
180+
181+
**12.1.3**
182+
- gitlab: upgrade CE to v12.1.3
183+
184+
**12.1.2**
185+
- gitlab: upgrade CE to v12.1.2
186+
187+
**12.1.1**
188+
- gitlab: upgrade CE to v12.1.1
189+
190+
**12.1.0**
191+
- gitlab: upgrade CE to v12.1.0
192+
- Removed MySQL related information and packages. GitLab v12.1.X or greater requires only PostgreSQL. Do an Migration before upgrading to v12.1.X. For more Information have a look at the [Migration Guide](https://docs.gitlab.com/ce/update/mysql_to_postgresql.html)
193+
194+
**12.0.4**
195+
- gitlab: upgrade CE to v12.0.4
196+
197+
**12.0.3**
198+
- gitlab: upgrade CE to v12.0.3
199+
200+
**12.0.2**
201+
- gitlab: upgrade CE to v12.0.2
202+
203+
**12.0.1**
204+
- gitlab: upgrade CE to v12.0.1
205+
206+
**12.0.0**
207+
- gitlab: upgrade CE to v12.0.0
208+
- Update gitaly to 1.47.0
209+
- Update gitlab-shell to 9.3.0
210+
- Update gitlab-pages to 1.6.1
211+
- ruby: update to 2.6
212+
- python: update to 3
213+
214+
**11.11.3**
215+
- gitlab: upgrade CE to v11.11.3
216+
- Update gitaly to 1.42.4
217+
- Update golang to 1.12.6
218+
219+
**11.11.2**
220+
- gitlab: upgrade CE to v11.11.2
221+
- Update gitaly to 1.42.3
222+
223+
**11.11.1**
224+
- gitlab: upgrade CE to v11.11.1
225+
- Update gitaly to 1.42.2
226+
227+
**11.11.0**
228+
- gitlab: upgrade CE to v11.11.0
229+
- Update gitaly to 1.42.0
230+
- Update gitlab-shell to 9.1.0
231+
- Update gitlab-workhorse to 8.7.0
232+
233+
**11.10.4**
234+
- gitlab: upgrade CE to v11.10.4
235+
236+
**11.10.3**
237+
- gitlab: upgrade CE to v11.10.3
238+
239+
**11.10.2**
240+
- gitlab: upgrade CE to v11.10.2
241+
242+
**11.10.1**
243+
- gitlab: upgrade CE to v11.10.1
244+
245+
**11.10.0**
246+
- gitlab: upgrade CE to v11.10.0
247+
248+
**11.9.8**
249+
- gitlab: upgrade CE to v11.9.8
250+
251+
**11.9.7**
252+
- gitlab: upgrade CE to v11.9.7
253+
254+
**11.9.6**
255+
- gitlab: upgrade CE to v11.9.6
256+
257+
**11.9.5**
258+
- gitlab: upgrade CE to v11.9.5
259+
260+
**11.9.4**
261+
- gitlab: upgrade CE to v11.9.4
262+
- Update gitlab-workhorse to 8.3.3
263+
264+
**11.9.1**
265+
- gitlab: upgrade CE to v11.9.1
266+
- Update gitaly to 1.27.1
267+
268+
**11.9.0**
269+
- gitlab: upgrade CE to v11.9.0
5270

6271
**11.8.3**
7272
- gitlab: upgrade CE to v11.8.3
@@ -451,7 +716,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o
451716

452717
**9.3.8**
453718
- gitlab: upgrade to CE v9.3.8
454-
- Added RE2 library to build dependencies ([issue 35342](https://gitlab.com/gitlab-org/gitlab-ce/issues/35342))
719+
- Added RE2 library to build dependencies ([issue 35342](https://gitlab.com/gitlab-org/gitlab-foss/issues/35342))
455720

456721
**9.3.7**
457722
- gitlab: upgrade to CE v9.3.7

0 commit comments

Comments
 (0)