archive-gh-me/docker-gitlab
1
0
Fork 0
mirror of https://github.com/sameersbn/docker-gitlab.git synced 2026-01-25 14:08:09 +00:00
Code Issues Projects Releases Wiki Activity
4,083 Commits 51 Branches 891 Tags
Commit Graph

248 Commits

Author SHA1 Message Date
KIMURA Kazunori
1934927aeb sync config/gitlabhq/puma.rb to gitlab v18.7.0 
Without those changes puma (and then gitlab itself) does not starts

See following upstream changes:
- https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128619
  (overwritten by gitlab-org/gitlab!132581)
- https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132581
- https://gitlab.com/gitlab-org/gitlab/-/merge_requests/211331
 2026-01-08 19:51:58 +01:00
th-2021
84463fea93
Merge branch 'master' into pages-update 2025-11-27 08:40:27 +01:00
Thomas Hiller
4c4fc65632 change localhost to 127.0.0.1 in assets/runtime 
squash following commits:

- 32f5332b05a6064169e6cc07d9c4a60b6a3dc7c5
  for configgitlab-pages/config
- f974a0197c74ca17343e5e3ff99a633347d8ad67
  for config/gitlab-shell/config.yml
- 1104bacb29ed7f20bdf20015552299bd08ae7313
  for config/gitlabhq/cable.yml
- 6ce37d8706cb289136385a7c498ad8c42faaab2c
  for config/gitlabhq/resque.yml
- 7336e042728f63da2cc302b6fd6f975eb26566dc
  for config/nginx/gitlab
- 1f39dcaabe7d3daa3b70ef0ae98ea8e30659e1e0
  for config/nginx/gitlab-pages
- 76aaf571e992c6e5b970a437f8c46158d9867d65
  for config/nginx/gitlab-ssl
- 549f717ec0810c8e11f30fb40f08997c0b84b5e3
  for env-defaults but without KAS-related configs
  (original: add WEBTOKEN secret, remove GITLAB_KAS_SECRET)
 2025-10-24 17:54:46 +09:00
Steven Achilles
04bfca3805
Merge pull request #3126 from ysicing/master 
feat: Add support for Omniauth JWT login.
 2025-06-19 19:56:25 +02:00
ysicing
c742614eef
feat: Add support for Omniauth JWT login 2025-06-18 17:24:45 +08:00
Kazunori Kimura
ac47124a0d Allow setting ActiveRecord encryption secrets 
Add environment variable to set entry in secrets.yml related to
active record encryption

- active_record_encryption_primary_key (can be multiple)
- active_record_encryption_deterministic_key (can be multiple)
- active_record_encryption_key_derivation_salt

Reference for '32 characters length' recommendation:
https://gitlab.com/gitlab-org/gitlab/-/blob/v18.0.0-ee/config/initializers/2_secret_token.rb#L78-80

TODO: fix command line usage in documentation
 2025-06-17 18:53:25 +09:00
Henadii Sychevskyi
d8fb586b0c
redirects fix 2025-06-03 13:27:16 +02:00
Steven Achilles
b9f8719919 Fix nginx configuration 2025-02-22 20:09:00 +01:00
Kazunori Kimura
fc0012a696 Change nginx log format name from main 
it reports error as it is duplicated
 2025-02-21 11:37:04 +09:00
Thomas Hiller
f890d36ad1 pages namespace in path 2024-10-10 10:02:10 +02:00
Molnár Péter
f30613b192 Add support for Omniauth OpenID Connect login. 2024-06-18 21:37:37 +02:00
Yannis Mazzer
5204971ce0 #2420 Handle encrypted_settings_key_base variable to allow restoring backups from gitlab instances not running from this image and using encrypted settings feature. 2024-05-24 20:34:18 +02:00
massej
e574613c9e
Update assets/runtime/config/gitlabhq/gitlab.yml 
Co-authored-by: Kazunori Kimura <33391846+kkimurak@users.noreply.github.com>
 2023-10-24 08:23:11 -04:00
massej
d11ae7b617
Added missing configuration variable OAUTH_ALLOW_BYPASS_TWO_FACTOR. 2023-10-23 22:17:20 -04:00
Steven Achilles
daae8b70d3
Merge pull request #2841 from massej/patch-1 
Added - OAuth2 Generic - missing label and scope variables
 2023-10-23 22:45:00 +02:00
Kazunori Kimura
a2dd4e5ed8 Accept multiple hosts for RACK_ATTACK_WHITELIST 
see sameersbn/docker-gitlab#2828

The current setup also accepts multiple hosts,
but the syntax is a bit strange.
The leading/trailing double quotes are embedded
in the configuration file itself,
so users should expect double quotes around the string they set.
In other words, when setting two hosts 0.0.0.0 and 1.1.1.1,
you will set the strings 0.0.0.0","1.1.1.1 in the
environment variables. This is not intuitive.

This commit removes double quote around corresponding config
and set backward compatibility fallback process
to surround whole with [], each host with double quote.
Also, validation script (written in ruby) will be executed during configuration.

Example docker-compose.yml
````yaml
services:
  gitlab:
    image: sameersbn/gitlab:latest
    environment:
    - RACK_ATTACK_WHITELIST='["127.0.0.1","0.0.0.0"]'
````

Co-authored-by: Mikhail Khadarenka <chodorenko@mail.ru>
 2023-10-20 22:24:22 +09:00
massej
c8bc43b914
Added missing label and scope variable field. 2023-10-01 13:40:45 -04:00
Steven Achilles
fbb9a7422b Update puma.rb 2023-06-24 08:40:57 +02:00
Steven Achilles
a63405d433 Add pool option to database.yml 2023-06-18 09:42:35 +02:00
Steven Achilles
5fc732eb3c Add new configuration options for database.yml 2023-05-25 06:44:20 +02:00
Ivan Baranov
8b9ca622f9 Tested support for azure_activedirectory_v2 2022-09-05 21:46:20 +09:00
Steven Achilles
a02abdce2d Address inconsistencies when using git (packaged with gitaly). 2022-05-03 17:58:58 +02:00
Steven Achilles
073eb52cb2
Merge pull request #2438 from peter-jozsa/allow-to-config-terraform-state 
Allow to configure Terraform State
 2022-04-22 16:15:01 +02:00
Péter Józsa
7374743a0f fix wrong footer comment of GCS related terraform state configuration 2022-04-11 12:13:21 +02:00
Péter Józsa
4752be956c Allow to configure terraform state feature 2022-04-11 12:13:09 +02:00
Poppo
86a329086a refs https://github.com/sameersbn/docker-gitlab/issues/2538: Fix Variables for UPLOADS in GCP 2022-04-08 17:10:45 +02:00
Kazunori Kimura
e91d9b5f7c support GITLAB_ISSUE_CLOSING_PATTERN 2022-03-27 07:28:01 +09:00
Kazunori Kimura
a9b4feb77b add NGINX_CUSTOM_GITLAB_SERVER_CONFIG 2022-03-04 22:49:52 +09:00
Kazunori Kimura
4943e1ffc0 replace non-break space with normal space 
especially, rails warns when "non-break space" found
in configuration file (such as cable.yml)
 2022-02-19 14:02:16 +09:00
Paolo Mainardi
36330f5366 Support actioncable 2022-01-03 16:32:16 +01:00
Steven Achilles
d4ede13e38 Use new syntax for 'config/database.yml' 2021-12-29 22:03:57 +01:00
Kazunori Kimura
729a00a3c9 remove runtime/config/gitlabhq/rack_attack.rb 2021-10-09 15:45:11 +09:00
Akanoa
e2354ed8aa feat: Add "AWS_SIGNATURE_VERSION" related environment variables 2021-07-30 22:41:31 +00:00
Akanoa
cfa1fe2e28 fix: bad default value 2021-07-30 16:32:24 +00:00
Akanoa
bed4200b02 feat: allow to configure the packages registry from environment variables 2021-07-30 16:32:24 +00:00
sue445
73dae28e31 Pass {{GITLAB_INSTALL_DIR}} to gitlab-pages/config 2021-07-21 09:38:37 +09:00
sue445
50bad15845 Resolved. GitLab Pages doesn't work since GitLab v14.0 
ref. #2375

As I can see from the error message below, it looks like both
`api-secret-key` and `gitlab-server` (or `internal-gitlab-server` ) are required since GitLab v14.0

```
time="2021-06-28T02:28:34Z" level=fatal msg="could not create domains config source" error="GitLab API URL or API secret has not been provided"
```

https://gitlab.com/gitlab-org/gitlab-pages/-/blob/v1.41.0/internal/source/gitlab/client/client.go#L50-52
 2021-07-20 18:38:04 +09:00
Sameer Naik
6b619f4891
Merge pull request #2311 from sue445/csp_params 
Add content_security_policy params
 2021-06-23 10:45:20 +05:30
Sameer Naik
7b25affe22
Merge pull request #2321 from l00v3/add_prevent_ldap_sign_in 
Add LDAP_PREVENT_LDAP_SIGN_IN configuration parameter
 2021-06-21 10:31:36 +05:30
Rene Gärtner
bb6a889e0b added OAUTH_AUTO_LINK_USER option 2021-04-30 14:17:28 +02:00
sue445
b820c61f33 Add content_security_policy params 2021-04-18 23:28:28 +09:00
l00v3
9b7536a32e Add LDAP_PREVENT_LDAP_SIGN_IN configuration parameter 
Committer: l00v3 <love@localhost.localdomain>
 2021-03-12 11:59:03 +01:00
Sameer Naik
950b1e8242
Merge pull request #2183 from galet/master 
Obfuscate access_token and private_token in nginx access log
 2021-03-10 14:37:52 +05:30
Sameer Naik
adf79a6c11 functions: properly delete the bitbucket auth config when not in use 2021-03-10 13:42:54 +05:30
Bruno Léon
8311b1ee74 Set default value for BITBUCKET_URL 
If this value is not set importing repo fails when connecting to
bitbucket.
 2021-02-23 08:19:52 +01:00
麦当苗儿
83202cdf6a
added SSL_PROTOCOLS option to change protocols of the nginx (#2304) 2021-02-16 08:21:06 +01:00
sue445
0946fef04c Add GITLAB_PAGES_ARTIFACTS_SERVER_URL 2020-12-02 22:57:46 +01:00
Constantin Wildförster
740677fe34 fixes #2200 2020-08-12 07:51:08 +02:00
Constantin Wildförster
8411b944e4 fix wrong gitaly configuration 2020-08-02 17:15:51 +02:00
Constantin Wildförster
ad57e9f354 add gitlab url to gitaly.toml config 2020-08-02 17:15:51 +02:00