Skip to content

Commit 9145c48

Browse files
committed
Add circle-ci badge and lint readme
1 parent f9b62de commit 9145c48

File tree

1 file changed

+29
-34
lines changed

1 file changed

+29
-34
lines changed

README.md

Lines changed: 29 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
[![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
2-
31
# sameersbn/gitlab:14.9.1
42

3+
[![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
4+
55
- [Introduction](#introduction)
66
- [Changelog](Changelog.md)
77
- [Contributing](#contributing)
@@ -199,7 +199,7 @@ docker run --name gitlab -d \
199199

200200
*Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
201201

202-
__NOTE__: Please allow a couple of minutes for the GitLab application to start.
202+
**NOTE**: Please allow a couple of minutes for the GitLab application to start.
203203

204204
Point your browser to `http://localhost:10080` and set a password for the `root` user account.
205205

@@ -213,7 +213,7 @@ You should now have the GitLab application up and ready for testing. If you want
213213

214214
GitLab is a code hosting software and as such you don't want to lose your code when the docker container is stopped/deleted. To avoid losing any data, you should mount a volume at,
215215

216-
* `/home/git/data`
216+
- `/home/git/data`
217217

218218
*Note: that if you are using the `docker-compose` approach, you must "inpect" the volumes (```docker volume inpect```) to check the mounted path.*
219219

@@ -313,10 +313,10 @@ docker run --name gitlab -d --link gitlab-postgresql:postgresql \
313313

314314
Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
315315

316-
- [postgres](https://hub.docker.com/_/postgres/)
317-
- [sameersbn/postgresql](https://quay.io/repository/sameersbn/postgresql/)
318-
- [orchardup/postgresql](https://hub.docker.com/r/orchardup/postgresql/)
319-
- [paintedfox/postgresql](https://hub.docker.com/r/paintedfox/postgresql/)
316+
- [postgres](https://hub.docker.com/_/postgres/)
317+
- [sameersbn/postgresql](https://quay.io/repository/sameersbn/postgresql/)
318+
- [orchardup/postgresql](https://hub.docker.com/r/orchardup/postgresql/)
319+
- [paintedfox/postgresql](https://hub.docker.com/r/paintedfox/postgresql/)
320320

321321
#### Upgrading PostgreSQL
322322

@@ -419,6 +419,7 @@ Access to the gitlab application can be secured using SSL so as to prevent unaut
419419
Jump to the [Using HTTPS with a load balancer](#using-https-with-a-load-balancer) section if you are using a load balancer such as hipache, haproxy or nginx.
420420

421421
To secure your application via SSL you basically need two things:
422+
422423
- **Private key (.key)**
423424
- **SSL certificate (.crt)**
424425

@@ -470,7 +471,6 @@ In case use of docker-compose ...
470471

471472
look for "< user >_gitlab-data" and copy the "certs" directory into the "Mountpoint"
472473

473-
474474
```bash
475475
mkdir -p /srv/docker/gitlab/gitlab/certs
476476
cp gitlab.key /srv/docker/gitlab/gitlab/certs/
@@ -593,7 +593,7 @@ Refer to the GitLab [documentation](http://doc.gitlab.com/ce/integration/omniaut
593593

594594
#### CAS3
595595

596-
To enable the CAS OmniAuth provider you must register your application with your CAS instance. This requires the service URL GitLab will supply to CAS. It should be something like: https://git.example.com:443/users/auth/cas3/callback?url. By default handling for SLO is enabled, you only need to configure CAS for backchannel logout.
596+
To enable the CAS OmniAuth provider you must register your application with your CAS instance. This requires the service URL GitLab will supply to CAS. It should be something like: `https://git.example.com:443/users/auth/cas3/callback?url`. By default handling for SLO is enabled, you only need to configure CAS for backchannel logout.
597597

598598
For example, if your cas server url is `https://sso.example.com`, then adding `--env 'OAUTH_CAS3_SERVER=https://sso.example.com'` to the docker run command enables support for CAS3 OAuth. Please refer to [Available Configuration Parameters](#available-configuration-parameters) for additional CAS3 configuration parameters.
599599

@@ -709,14 +709,14 @@ Gitlab pages access control requires additional configuration before activating
709709

710710
Gitab pages access control makes use of the Gitlab OAuth Module.
711711

712-
- Goto the Gitlab Admin area
713-
- Select `Applications` in the menu
714-
- Create `New Application`
715-
- Name: `Gitlab Pages`
716-
- Scopes:
717-
- api
718-
- Trusted: NO (Do not select)
719-
- Redirect URI: https://projects.<GITLAB_PAGES_DOMAIN>/auth
712+
- Goto the Gitlab Admin area
713+
- Select `Applications` in the menu
714+
- Create `New Application`
715+
- Name: `Gitlab Pages`
716+
- Scopes:
717+
- api
718+
- Trusted: NO (Do not select)
719+
- Redirect URI: `https://projects.<GITLAB_PAGES_DOMAIN>/auth`
720720

721721
Note about the `Redirect URI`; this can be tricky to configure or figure out, What needs to be achieved is to following, the redirect URI needs to end up at the `gitlab-pages` daemon with the `/auth` endpoint.
722722

@@ -741,7 +741,6 @@ Add to following environment variables to your Gitlab Container.
741741

742742
After you have enabled the gitlab pages access control. When you go to a project `General Settings` -> `Permissions` you can choose the pages persmission level for the project.
743743

744-
745744
### External Issue Trackers
746745

747746
Since version `7.10.0` support for external issue trackers can be enabled in the "Service Templates" section of the settings panel.
@@ -777,12 +776,10 @@ These options should contain something like:
777776
- `PIWIK_URL=piwik.example.org`
778777
- `PIWIK_SITE_ID=42`
779778

780-
781779
### Available Configuration Parameters
782780

783781
*Please refer the docker run command options for the `--env-file` flag where you can specify all required environment variables in a single file. This will save you from writing a potentially long docker run command. Alternatively you can use docker-compose. docker-compose users and Docker Swarm mode users can also use the [secrets and config file options](#docker-secrets-and-configs)*
784782

785-
786783
Below is the complete list of available options that can be used to customize your gitlab installation.
787784

788785
#### `DEBUG`
@@ -2023,7 +2020,7 @@ GitHub App Client secret. No defaults.
20232020

20242021
#### `OAUTH_GITHUB_URL`
20252022

2026-
Url to the GitHub Enterprise server. Defaults to https://github.com
2023+
Url to the GitHub Enterprise server. Defaults to `https://github.com`
20272024

20282025
#### `OAUTH_GITHUB_VERIFY_SSL`
20292026

@@ -2047,7 +2044,7 @@ BitBucket App Client secret. No defaults.
20472044

20482045
#### `OAUTH_BITBUCKET_URL`
20492046

2050-
Bitbucket URL. Defaults: https://bitbucket.org/
2047+
Bitbucket URL. Defaults: `https://bitbucket.org/`
20512048

20522049
#### `OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL`
20532050

@@ -2415,7 +2412,6 @@ docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available b
24152412
docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.10.0 # Choose to restore from 1515629493
24162413
```
24172414

2418-
24192415
## Host Key Backups (ssh)
24202416

24212417
SSH keys are not backed up in the normal gitlab backup process. You
@@ -2477,7 +2473,7 @@ Or
24772473
docker exec -it gitlab sudo -HEu git bundle exec rake gitlab:import:repos RAILS_ENV=production
24782474
```
24792475

2480-
For a complete list of available rake tasks please refer https://github.com/gitlabhq/gitlabhq/tree/master/doc/raketasks or the help section of your gitlab installation.
2476+
For a complete list of available rake tasks please refer <https://github.com/gitlabhq/gitlabhq/tree/master/doc/raketasks> or the help section of your gitlab installation.
24812477

24822478
*P.S. Please avoid running the rake tasks for backup and restore operations on a running gitlab instance.*
24832479

@@ -2513,7 +2509,7 @@ Usage when using `docker-compose` can also be found there.
25132509
>
25142510
> Since GitLab release `8.6.0` PostgreSQL users should enable `pg_trgm` extension on the GitLab database. Refer to GitLab's [Postgresql Requirements](http://doc.gitlab.com/ce/install/requirements.html#postgresql-requirements) for more information
25152511
>
2516-
> If you're using `sameersbn/postgresql` then please upgrade to `sameersbn/postgresql:12-20200524` or later and add `DB_EXTENSION=pg_trgm,btree_gist` to the environment of the PostgreSQL container (see: https://github.com/sameersbn/docker-gitlab/blob/master/docker-compose.yml#L8).
2512+
> If you're using `sameersbn/postgresql` then please upgrade to `sameersbn/postgresql:12-20200524` or later and add `DB_EXTENSION=pg_trgm,btree_gist` to the environment of the PostgreSQL container (see: <https://github.com/sameersbn/docker-gitlab/blob/master/docker-compose.yml#L8>).
25172513
>
25182514
> As of version 13.7.0, the required PostgreSQL is version 12.x. If you're using PostgreSQL image other than the above, please review section [Upgrading PostgreSQL](#upgrading-postgresql).
25192515
@@ -2550,7 +2546,6 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
25502546
- **Step 4**: Start the image
25512547

25522548
> **Note**: Since GitLab `8.0.0` you need to provide the `GITLAB_SECRETS_DB_KEY_BASE` parameter while starting the image.
2553-
25542549
> **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters.
25552550
25562551
```bash
@@ -2609,10 +2604,10 @@ docker inspect --format "{{json .State.Health }}" $(docker-compose ps -q gitlab)
26092604

26102605
# References
26112606

2612-
* https://github.com/gitlabhq/gitlabhq
2613-
* https://github.com/gitlabhq/gitlabhq/blob/master/doc/install/installation.md
2614-
* http://wiki.nginx.org/HttpSslModule
2615-
* https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html
2616-
* https://github.com/gitlabhq/gitlab-recipes/blob/master/web-server/nginx/gitlab-ssl
2617-
* https://github.com/jpetazzo/nsenter
2618-
* https://jpetazzo.github.io/2014/03/23/lxc-attach-nsinit-nsenter-docker-0-9/
2607+
- <https://github.com/gitlabhq/gitlabhq>
2608+
- <https://github.com/gitlabhq/gitlabhq/blob/master/doc/install/installation.md>
2609+
- <http://wiki.nginx.org/HttpSslModule>
2610+
- <https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html>
2611+
- <https://github.com/gitlabhq/gitlab-recipes/blob/master/web-server/nginx/gitlab-ssl>
2612+
- <https://github.com/jpetazzo/nsenter>
2613+
- <https://jpetazzo.github.io/2014/03/23/lxc-attach-nsinit-nsenter-docker-0-9/>

0 commit comments

Comments
 (0)