archive-gh-me/docker-gitlab
1
0
Fork 0
mirror of https://github.com/sameersbn/docker-gitlab.git synced 2026-01-18 13:58:25 +00:00
Code Issues Projects Releases Wiki Activity
3,659 Commits 51 Branches 887 Tags
Commit Graph

933 Commits

Author SHA1 Message Date
Kazunori Kimura
029186dc63 Avoid permission error on creating config file 
`assets/build/config/database.yml.postgresql` is owned by root:root,
and permission is rwxrw----
so the user `git` (`${GILTAB_USER}`) doesn't have a permission to copy the file.
This raises an error while building.
 2023-04-17 16:06:35 +09:00
Steven Achilles
5450187484
Merge pull request #2735 from zimmski/enable-git-protocol-2 
Allow SSH clients to explicitly set the Git transfer protocol
 2023-04-12 16:17:53 +02:00
Kazunori Kimura
95bc778ee0 Silence "CRIT unixServer" warning from supervisord 
Silence the message like below:
  CRIT Server 'unix_http_server' running without any HTTP authentication checking

Reference:
  https://github.com/Supervisor/supervisor/issues/717#issuecomment-176860145
  https://github.com/sameersbn/docker-redmine/commit/0fb84b9
 2023-03-31 03:01:19 +09:00
Markus Zimmermann
4bfc8974ba
Allow SSH clients to explicitly set the Git transfer protocol 
This allows to the client to explicitly select protocol version 2, which is much more efficient. Without allowing that environment variable it seems that SSH connections are always stuck in version1.  See https://docs.gitlab.com/ee/administration/git_protocol.html on how to check if protocol 2 is used.
 2023-03-24 11:55:42 +01:00
Steven Achilles
9e58a673c1
Merge pull request #2716 from kkimurak/increase-default-sidekiq-memory-killer-max-rss 
Increase default value for SIDEKIQ_MEMORY_KILLER_MAX_RSS to 2GB
 2023-03-13 00:29:03 +01:00
Kazunori Kimura
a1dcfe6eaf Update sidekiq supervisord config; sidekiq v6.0 
Sidekiq is updated to v6.0 here (first contained tag: v14.4.0-ee)
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69655

In Sidekiq 6.0, these options have been marked as "deprecated":
-P (set pid file)
-L (set log file)
See https://github.com/sidekiq/sidekiq/commit/3f5b1c5

Now, we can see error message in {GITLAB_LOGS_DIR}/supervisor/sidekiq.log
like below:

----
ERROR: PID file creation was removed in Sidekiq 6.0, please use a proper process supervisor to start and manage your services
ERROR: Logfile redirection was removed in Sidekiq 6.0, Sidekiq will only log to STDOUT
----

Just stop using this option.
 2023-02-22 20:42:51 +09:00
Kazunori Kimura
10a48c1541 Clarify user=root in supervisord.conf 
to prevent "Supervisor running as root" warning
 2023-02-22 20:42:51 +09:00
Kazunori Kimura
255ec9461a Increase default SIDEKIQ_MEMORY_KILLER_MAX_RSS to 2GB 
There are many warnings like below
recorded in {GITLAB_LOG_DIR}/supervisord/sidekiq.log.
This can be avoided by simply increasing SIDEKIQ_MEMORY_KILLER_MAX_RSS.

----
{
  "severity": "WARN",
  "time": "[MASKED]",
  "class": "Gitlab::SidekiqDaemon::MemoryKiller",
  "pid": [MASKED],
  "message": "Sidekiq worker RSS out of range",
  "current_rss": 1009636,
  "soft_limit_rss": 1000000,
  "hard_limit_rss": [MASKED],
  "memory_total_kb": [MASKED],
  "reason": "current_rss(1009636) \u003e soft_limit_rss(1000000)",
  "running_jobs": [],
  "retry": 0
}
----

For sameersbn/gitlab, this parameter have been introduced with
following commit on May 21, 2015 and never updated until today:
e4008cc7ab9efd626511af4c43e52e2a9490d612

On upstream, the default setting documentation is updated here:
  https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/31682
but it is said "the documentation is outdated" at this time.
I could not find out when the value is increased.

At least, In omnibus-gitlab, this have been introduced in MR 2360
(release 11.10.0+ce.0 / 11.10.0+ee.0)
https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/2360
 2023-02-22 04:00:45 +09:00
Antt1995
8db9ed8908
Upgrade Go & safe dir 2022-11-23 15:14:40 +00:00
kkkkkks0
f408585d8b
fixes sameersbn#2645 2022-10-20 18:58:03 +08:00
Ivan Baranov
8b9ca622f9 Tested support for azure_activedirectory_v2 2022-09-05 21:46:20 +09:00
Steven Achilles
5c9c5cad1b Temporary remove geo from config/database.yml 2022-07-02 15:49:54 +02:00
Steven Achilles
b34d48af65
Merge pull request #2594 from Syphon83/terraform_state_fix 
refs https://github.com/sameersbn/docker-gitlab/issues/2593: fix env default variable for terraform state
 2022-07-02 15:47:07 +02:00
Steven Achilles
eba7979564
Merge pull request #2579 from kkimurak/set-upload-object_store-enabled-even-if-disabled 
Set `*:object_store:enabled` in gitlab.yml regardless the value
 2022-07-02 15:46:54 +02:00
Poppo
7d0739218f fix env default variable 2022-06-24 20:12:32 +02:00
Kazunori Kimura
fbcdd290be fix condition to apply patch during build gitlab 
rewrite patch applying with find | while read chain
`if [[ -f ]]` with globbing may not works
 2022-06-21 08:46:32 +09:00
Kazunori Kimura
844d57dad2 update *:object_store:enabled regardless of the value 
apply for artifact,packages,terraform_state,lfs,uploads
 2022-06-21 08:46:05 +09:00
haroldsamuels87
944a638a28
fixed a typo 
took me 5 HOURS to find this tiny little typo.
 2022-05-12 18:13:55 +04:30
Steven Achilles
0badf7cdd7 Use git instead of git-core 2022-05-05 19:53:52 +02:00
Steven Achilles
64e6256012 transfer build packages from Dockerfile to install.sh 2022-05-03 19:36:22 +02:00
Steven Achilles
889d9c36bf collective deletion of packages 2022-05-03 19:14:50 +02:00
Steven Achilles
a02abdce2d Address inconsistencies when using git (packaged with gitaly). 2022-05-03 17:58:58 +02:00
Paolo Mainardi
21b459216b refs #2549: Install git from gitaly 2022-04-29 17:19:40 +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
Steven Achilles
d7a3f1fd47
Merge pull request #2541 from kkimurak/set-bundler-version-based-on-gemfile-lock 
Update `bundler` from 2.1.4 to 2.3.6
 2022-04-14 16:55:57 +02:00
Kazunori Kimura
464cd644d6 set bundler version based on gitlab's Gemfile.lock 
bundler used in gitlab is upgraded from 2.1.4 to 2.3.6
See more detail on : https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79251
first contained tag : v14.8.0
 2022-04-14 00:30:26 +09:00
Péter Józsa
82e88ff0ad create terraform state directory based on new configuration variables during datadir initialization 
#2501
 2022-04-11 12:13:28 +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
Steven Achilles
1a091cea44
Merge pull request #2511 from getfloret/master 
Fix: HealthCheck Script will Fail if the ENV GITLAB_HTTPS set True
 2022-03-29 20:45:41 +02:00
AlpsTsui
def7ef5fea Fix: HealthCheck Script will Fail if the ENV GITLAB_HTTPS set True 2022-03-29 22:22:31 +08:00
Kazunori Kimura
e91d9b5f7c support GITLAB_ISSUE_CLOSING_PATTERN 2022-03-27 07:28:01 +09:00
Steven Achilles
db443892e2
Merge branch 'master' into upgrade-to-14.9.0 2022-03-24 12:27:00 +01:00
Olivier Mueller
3ab737d218 Fix suggested by Kazunori Kimura 2022-03-23 13:02:14 +01: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
Steven Achilles
fa06a81aaf
Merge pull request #2502 from kkimurak/fix-ssh-host-key-on-help-page 
Use persisted host key path for `SSH_ALGORITHMS_PATH`
 2022-01-29 12:42:05 +01:00
Kazunori Kimura
2448c6aada add terraform/packages dir to initialize_datadir() 
Also add them to sanitize_datadir()

Note that the backup will fail if these directories do not exist
with each feature enabled.
 2022-01-28 02:12:35 +09:00
Kazunori Kimura
af9bfee78f add patch to change SSH_ALGORITHMS_PATH 
To enable ssh host key info in help page
 2022-01-26 00:23:40 +09:00
Paolo Mainardi
09e76bb2e7 Missing redis db number 2022-01-03 18:28:10 +01:00
Paolo Mainardi
0a24da2cfe Copy cable.yml template file 2022-01-03 16:54:08 +01: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
Steven Achilles
e83bb7e17a Rename/remove build patch for gitlab-foss 
- Expand if condition so that non-existent gitlab patches are not a problem
 2021-12-23 13:04:38 +01:00
sue445
82576f27d0 Fixed Pages config not being created when GITLAB_PAGES_ACCESS_CONTROL was disabled 2021-12-09 22:24:30 +01:00
Steven Achilles
6c0888b669 Add make target for gitlab-shell 2021-10-19 22:18:11 +02:00
Steven Achilles
3232a10fe4 Update base image, fix problems compiling gitlab-shell and complete changelog 2021-10-19 21:41:12 +02:00
Steven Achilles
1d6fa315f2
Merge pull request #2429 from kkimurak/install-ruby-from-source 
Install ruby from source
 2021-10-19 21:01:53 +02:00
Steven Achilles
c36fc17354
Add variable for the source url of ruby 
I think that defining a variable for the source of the Ruby tarball makes sense.
 2021-10-19 20:00:55 +02:00