Skip to content

Commit

Permalink
add named volumes + add ssh port variables
Browse files Browse the repository at this point in the history
  • Loading branch information
FlorentPoinsaut committed May 27, 2019
1 parent a01721e commit 7dd95cd
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 9 deletions.
1 change: 1 addition & 0 deletions .env → .env.dist
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
GITLAB_HOSTNAME=my.domain.tld
GITLAB_SSH_PORT=22
4 changes: 1 addition & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
config/
data/
logs/
.env
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ git clone https://github.com/solution-libre/docker-gitlab.git gitlab
cd gitlab
```

Change the hostname value in `.env`.
Declare environment variables or copy the `.env.dist` to `.env` and adjust its values.

## Usage

Expand All @@ -38,6 +38,10 @@ docker-compose up -d

The GitLab hostname. Default value: 'my.domain.tld'

#### `GITLAB_SSH_PORT`

The GitLab SSH port for git. Default value: '22'

## Development

[Solution Libre](https://www.solution-libre.fr)'s repositories are open projects, and community contributions are essential for keeping them great.
Expand Down
16 changes: 11 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,25 @@ services:
- default
- web
ports:
- '22:22'
- ${GITLAB_SSH_PORT}:22
volumes:
- ./docker-volume/web/config:/etc/gitlab
- ./docker-volume/web/logs:/var/log/gitlab
- ./docker-volume/web/data:/var/opt/gitlab
- web_config:/etc/gitlab
- web_logs:/var/log/gitlab
- web_data:/var/opt/gitlab

runner:
image: 'gitlab/gitlab-runner:latest'
restart: always
volumes:
- ./docker-volume/runner/config:/etc/gitlab-runner
- runner_config:/etc/gitlab-runner
- /var/run/docker.sock:/var/run/docker.sock

networks:
web:
external: true

volumes:
runner_config:
web_config:
web_data:
web_logs:

0 comments on commit 7dd95cd

Please sign in to comment.