Skip to content

Commit 092bc12

Browse files
committed
bump to 1.56
1 parent 7ca70d9 commit 092bc12

File tree

7 files changed

+71
-219
lines changed

7 files changed

+71
-219
lines changed

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11

2-
# Changelog
2+
# CHANGELOG.md
3+
4+
## 1.56
5+
- bump to traefik 1.7.7
6+
- better log management on all services
7+
- better README
8+
- better comments within compose files
39

410
## 1.55
511
- traefik is now using Authentification

CODE_OF_CONDUCT.md

Lines changed: 0 additions & 22 deletions
This file was deleted.

CONTRIBUTING.md

Lines changed: 0 additions & 121 deletions
This file was deleted.

LICENCE.md

Lines changed: 0 additions & 9 deletions
This file was deleted.

LICENSE

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
A bunch of Docker Stack that just works. Well tested on play-with-docker.com
2+
https://github.com/pascalandy/docker-stack-this
3+
4+
Copyright (C) 2019 pascalandy.com/blog/now OR https://twitter.com/askpascalandy OR https://github.com/pascalandy
5+
6+
This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
7+
8+
Read it here: https://github.com/pascalandy/GNU-GENERAL-PUBLIC-LICENSE/blob/master/LICENSE.md
9+
10+
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
11+
12+
You should have received a copy of the GNU General Public License along with this program. If not, read it here https://github.com/pascalandy/GNU-GENERAL-PUBLIC-LICENSE/blob/master/LICENSE.md

README.md

Lines changed: 33 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,59 @@
1+
## Start here
2+
3+
The most solid stack can be found under: [traefik_stack5](./traefik_stack5)
4+
5+
This project is a **monorepo** (or an aggregation of mini-projects). Just navigate the directories!
6+
17
## What is this?
28

3-
The main goal is to create the **easiest** and **quickest** docker stack available around the **Docker Swarm ecosystem**. I really wished I had this when I started (while back when docker-compose was called fig).
9+
The primary goal is to create the **easiest** and **quickest** docker stack available around the **Docker Swarm ecosystem**. I wished I had this when I started (while back when docker-compose was called fig).
410

511
I hope the community will use this repo as a base project to demo other stuff like CMS, Log, Monitoring, Volume and Storage, Dbs, Benchmark tools and other cool applications we love to use in Docker.
612

7-
To accomplish this, we put together the power of :
13+
To accomplish this, we use the power of :
814

915
- play-with-docker (#pwg)
1016
- Docker Swarm mode
1117
- Docker stacks
1218

1319

14-
## Start here
15-
16-
The most complete stack at the moment is: [traefik_stack5](./traefik_stack5)
17-
18-
This project is a **monorepo** (or an aggregation of mini-projects). Just navigate the directories!
19-
20-
**Quick links**
21-
22-
- [CHANGELOG](./CHANGELOG.md)
23-
- [LICENCE](./LICENCE.md)
24-
- [CONTRIBUTING](./CONTRIBUTING.md)
25-
- [CODE_OF_CONDUCT](./CODE_OF_CONDUCT.md)
26-
- [My Twitter](https://twitter.com/askpascalandy)
27-
28-
2920
## Contributing
3021

31-
Thanks to the power of communities, this is where `1 + 1 = 3`.
22+
The power of communities pull request and forks means that `1 + 1 = 3`. Help me make this repo a better one!
3223

3324
1. Fork it
3425
2. Create your feature branch: `git checkout -b my-new-feature`
3526
3. Commit your changes: `git commit -am 'Add some feature'`
3627
4. Push to the branch: `git push origin my-new-feature`
3728
5. Submit a pull request
3829

30+
Need help? Check this post: [Contributing to our Github project](https://pascalandy.com/blog/contributing-to-our-github-project/). Also, by contributing you agree to the [Contributor Code of Conduct on GitHub](https://pascalandy.com/blog/contributor-code-of-conduct-on-github/).
31+
32+
33+
## Copyright
34+
35+
- This git repo is under the **GNU V3** license. [Find it here](https://github.com/pascalandy/GNU-GENERAL-PUBLIC-LICENSE/blob/master/LICENSE.md).
36+
37+
38+
## Sources
39+
40+
- This Git repo is available at [https://github.com/pascalandy/docker-stack-this](https://github.com/pascalandy/docker-stack-this)
3941

40-
## License & Sources
4142

42-
- View the **GNU** license information at https://github.com/pascalandy/GNU-GENERAL-PUBLIC-LICENSE
43-
- This Git repo is available at https://github.com/pascalandy/docker-stack-this
43+
## Keep in touch
4444

45+
```
46+
____ _ _ _
47+
| _ \ __ _ ___ ___ __ _| | / \ _ __ __| |_ _
48+
| |_) / _` / __|/ __/ _` | | / _ \ | '_ \ / _` | | | |
49+
| __/ (_| \__ \ (_| (_| | | / ___ \| | | | (_| | |_| |
50+
|_| \__,_|___/\___\__,_|_| /_/ \_\_| |_|\__,_|\__, |
51+
|___/
52+
```
4553

46-
## Author
54+
- My [« now page »](https://pascalandy.com/blog/now/)
55+
- Follow me on [Twitter](https://twitter.com/askpascalandy)
4756

48-
In the world of OSS (open source software) most people refer themselves as maintainers. The thing is… I hate this expression. It feels heavy and not fun. I much prefer author.
57+
P.S. As you might see, I’m not a native English speaker. If something sounds funny, please let me know. Just [open an issue](https://github.com/firepress-org/ghostfire/issues). Thank you!
4958

50-
Shared by [Pascal Andy](https://pascalandy.com/blog/now/). Find me on [Twitter](https://twitter.com/askpascalandy).
59+
Cheers!

traefik_stack5/README.md

Lines changed: 19 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
## Introduction
22

3-
This docker stack will run many services (Traefik (with Authentification), Socat, Portainer, Nginx, Caddy, Whoami) in one simple copy-paste command. Please also refer the the [README](https://github.com/pascalandy/docker-stack-this/blob/master/README.md) at the root of this repo.
3+
This docker stack will run many services (Traefik (with auth), Socat, Portainer, Nginx, Caddy, Whoami) in a straightforward copy-paste command. Please also refer the [README](https://github.com/pascalandy/docker-stack-this/blob/master/README.md) at the root of this repo.
44

55
## Start here
66
1. Go to http://labs.play-with-docker.com/
77
2. Create *one instance*. Wait for the node to provision
88
3. Copy-paste:
99

10-
## Stable setup (recommanded)
10+
## Stable setup (recommended)
1111

1212
```
1313
echo "CONFIGURE ENV_VAR" && \
@@ -88,17 +88,25 @@ http://pwd10-0-7-3-80.host1.labs.play-with-docker.com/who3/
8888
http://pwd10-0-7-3-80.host1.labs.play-with-docker.com/portainer/
8989
```
9090

91-
The container for the first URL is actually named `home`.
91+
The container for the first URL is named `home`.
9292

9393

9494
#### Web apps details:
9595
- **/** = [caddy](https://github.com/pascalandy/caddy-securityheader)
96-
- **/who1/** = [caddy](https://github.com/pascalandy/caddy-securityheader)
97-
- **/who2/** = [whoami](https://hub.docker.com/r/emilevauge/whoami/)
96+
- **/who1** = [caddy](https://github.com/pascalandy/caddy-securityheader)
97+
- **/who2** = [whoami](https://hub.docker.com/r/emilevauge/whoami/)
9898
- **/portainer/** = [portainer](https://hub.docker.com/r/portainer/portainer/)
9999

100+
For /who1 and /who2 you will see the container's Ids (5fe91baf7a3a & 78a0c7287df1) in this example
100101

101-
## How to acces Traefik
102+
```
103+
$ docker ps | grep whoami
104+
5fe91baf7a3a emilevauge/whoami:latest "/whoamI" About a minute ago Up About a minute 80/tcp toolwebapp_who3.1.9zk09prm85gnl0ieuuncynhxh
105+
78a0c7287df1 emilevauge/whoami:latest "/whoamI" About a minute ago Up About a minute 80/tcp toolwebapp_who2.1.wj7vf83ag91ft7jgdy3gwejp4
106+
```
107+
108+
109+
## How to access Traefik
102110

103111
![traefik](https://user-images.githubusercontent.com/6694151/50121682-86334d80-0227-11e9-8f25-93dd8714d306.jpg)
104112

@@ -125,18 +133,18 @@ Insert this string in your `.configs/traefik.toml`.
125133

126134
#### What is Traefik?
127135

128-
[Traefik](https://docs.traefik.io/configuration/backends/docker/) is a powerful layer 7 reverse proxy. Once running, the proxy will give you access to many web apps. I think this is a solid use cases to understand how this reverse-proxy works.
136+
[Traefik](https://docs.traefik.io/configuration/backends/docker/) is a powerful layer 7 reverse proxy. Once running, the proxy will give you access to many web apps. I think this is a substantial use case to understand how this reverse-proxy works.
129137

130138
#### Traefik version
131139

132140
In `toolproxy.yml` look for something like `traefik:1.7.6`.
133141

134-
In some mono-repo I **my own traefik image**. Feel free to use the official images. It will not break anything.
142+
In some mono-repo, I **my own traefik image**. Feel free to use the official images. It will not break anything.
135143

136144
#### Other stuff to know?
137145

138-
- This stack does not use ACME (https://). ACME is a pain while developping … reaching limits, etc.
139-
- If you don’t want to use socat, checkout the monorepo `traefik-manager-noacme`
146+
- This stack does not use ACME (https://). ACME is a pain while developing … reaching limits, etc.
147+
- If you don’t want to use socat, check out the monorepo `traefik-manager-noacme`
140148

141149
## Screenshots
142150

@@ -156,39 +164,8 @@ In the active path, just execute those bash-scripts:
156164
- `./rundown.sh`
157165
- `./runctop.sh`
158166

159-
**Bonus!** `./runctop.sh` is not a stack but a simple docker run to see the memory consumed by each containers.
167+
**Bonus!** `./runctop.sh` is not a stack but a simple docker run to see the memory consumed by each container.
160168

161169
## ToDo
162170

163171
- Use SSL endpoints (ACME)
164-
165-
## Contributing
166-
167-
Thanks to the power of communities, this is where `1 + 1 = 3`.
168-
169-
1. Fork it
170-
2. Create your feature branch: `git checkout -b my-new-feature`
171-
3. Commit your changes: `git commit -am 'Add some feature'`
172-
4. Push to the branch: `git push origin my-new-feature`
173-
5. Submit a pull request
174-
175-
176-
## License & Sources
177-
178-
- View the **GNU** license information at https://github.com/pascalandy/GNU-GENERAL-PUBLIC-LICENSE
179-
- This Git repo is available at https://github.com/pascalandy/docker-stack-this
180-
181-
## Keep in touch
182-
183-
```
184-
____ _ _ _
185-
| _ \ __ _ ___ ___ __ _| | / \ _ __ __| |_ _
186-
| |_) / _` / __|/ __/ _` | | / _ \ | '_ \ / _` | | | |
187-
| __/ (_| \__ \ (_| (_| | | / ___ \| | | | (_| | |_| |
188-
|_| \__,_|___/\___\__,_|_| /_/ \_\_| |_|\__,_|\__, |
189-
|___/
190-
```
191-
192-
- Pascal Andy’s [« now page »](https://pascalandy.com/blog/now/)
193-
- Follow me on [Twitter](https://twitter.com/askpascalandy)
194-
- Find more Ghost Themes on [play-with-ghost.com](https://play-with-ghost.com/)

0 commit comments

Comments
 (0)