Skip to content

Commit 3fc7a6f

Browse files
Use traefik v2 syntax
1 parent 854397f commit 3fc7a6f

File tree

4 files changed

+84
-7
lines changed

4 files changed

+84
-7
lines changed

.github/dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: github-actions
4+
directory: /
5+
schedule:
6+
interval: daily

.github/workflows/ci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# This is a basic workflow to help you get started with Actions
2-
31
name: CI
42

53
on: [push, pull_request, workflow_dispatch]

CHANGELOG.md

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
# Changelog
2+
3+
All notable changes to this project will be documented in this file.
4+
5+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
6+
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
7+
8+
<!-- markdownlint-configure-file { "MD024": { "allow_different_nesting": true } } -->
9+
10+
## [2.0.0] 2022-07-15
11+
12+
### Added
13+
14+
- Add [Dependabot](https://github.com/dependabot) in CI.
15+
- This CHANGELOG file.
16+
17+
### Changed
18+
19+
- Upgrade to [Træfik](https://traefik.io/) [v2](https://doc.traefik.io/traefik/migration/v1-to-v2/) syntax.
20+
- Replace CI markdown check.
21+
- Use Docker Compose plugin.
22+
23+
## [1.1.0] 2022-06-22
24+
25+
### Added
26+
27+
- Add Mattermost configuration.
28+
29+
## [1.0.0] 2021-02-09
30+
31+
### Added
32+
33+
- Add a CI to check markdown and docker-compose syntaxes.
34+
- Add docker volumes symblink.
35+
- Add Traefik disclamer in docker-compose file.
36+
37+
### Changed
38+
39+
- Change always restart to unless-stopped.
40+
41+
### Fixed
42+
43+
- Fix default GitLab config with reverse proxy.
44+
- Fix README syntax.
45+
46+
## [0.3.0] 2019-05-27
47+
48+
### Added
49+
50+
- Add SSH port variable.
51+
52+
### Changed
53+
54+
- Use named volumes.
55+
56+
## [0.2.0] 2018-12-06
57+
58+
### Added
59+
60+
- Add a GitLab Runner.
61+
62+
## [0.1.0] 2018-04-10
63+
64+
### Added
65+
66+
- Docker-compose setup for starting GitLab with Træfik.
67+
68+
[2.0.0]: https://github.com/solution-libre/docker-bareos/compare/v1.1.0...v2.0.0
69+
[1.1.0]: https://github.com/solution-libre/docker-bareos/compare/v1.0.0...v1.1.0
70+
[1.0.0]: https://github.com/solution-libre/docker-bareos/compare/v0.3.0...v1.0.0
71+
[0.3.0]: https://github.com/solution-libre/docker-bareos/compare/v0.2.0...v0.3.0
72+
[0.2.0]: https://github.com/solution-libre/docker-bareos/compare/v0.1.0...v0.2.0
73+
[0.1.0]: https://github.com/solution-libre/docker-bareos/releases/tag/v0.1.0

docker-compose.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ services:
1919
# Traefik labels are suggested as an example for people using Traefik,
2020
# remove them if you are using another reverse proxy.
2121
labels:
22-
traefik.backend: 'gitlab'
2322
traefik.enable: 'true'
24-
traefik.docker.network: 'web'
25-
traefik.frontend.rule: "Host:${GITLAB_HOSTNAME}"
23+
traefik.http.routers.gitlab.entrypoints: websecure
24+
traefik.http.routers.gitlab.rule: "Host(`${GITLAB_HOSTNAME}`)"
25+
traefik.http.routers.gitlab.tls.certresolver: myresolver
2626
# If you want enable mattermost, comment the previous line and uncomment the next line
27-
# traefik.frontend.rule: "Host:${GITLAB_HOSTNAME},mattermost.${GITLAB_HOSTNAME}"
28-
traefik.port: '80'
27+
# traefik.http.routers.gitlab.tls.certresolver: "Host(`${GITLAB_HOSTNAME}`,`mattermost.${GITLAB_HOSTNAME}`)"
28+
traefik.http.services.gitlab.loadbalancer.server.port: 80
2929
# If you don't want to use a reverse proxy (not suitable for production!)
3030
# ports:
3131
# - "80:80"

0 commit comments

Comments
 (0)