Skip to content

Commit 6081c13

Browse files
committed
bump to 1.54 / see changelog
commit 9627576 Author: Pascal Andy <[email protected]> Date: Mon Dec 17 17:02:52 2018 -0500 various updates commit fb55f22 Author: Pascal Andy <[email protected]> Date: Mon Dec 17 16:57:07 2018 -0500 protainer commit d2b3a5f Author: Pascal Andy <[email protected]> Date: Mon Dec 17 16:52:44 2018 -0500 readme udpate commit e99e21e Author: Pascal Andy <[email protected]> Date: Mon Dec 17 16:49:08 2018 -0500 cleaning runup commit 7d28ba9 Author: Pascal Andy <[email protected]> Date: Mon Dec 17 16:44:50 2018 -0500 webapp commit 5c32e4a Author: Pascal Andy <[email protected]> Date: Mon Dec 17 16:41:46 2018 -0500 webapp commit 9de5c8d Author: Pascal Andy <[email protected]> Date: Mon Dec 17 16:39:48 2018 -0500 git clone depth 1 commit a37944e Author: Pascal Andy <[email protected]> Date: Mon Dec 17 16:38:39 2018 -0500 webapp commit 6299ffc Author: Pascal Andy <[email protected]> Date: Mon Dec 17 14:49:06 2018 -0500 formatting Signed-off-by: Pascal Andy <[email protected]> commit 0d5bc39 Author: Pascal Andy <[email protected]> Date: Mon Dec 17 14:40:41 2018 -0500 caddy commit b615c59 Author: Pascal Andy <[email protected]> Date: Mon Dec 17 14:36:40 2018 -0500 caddy commit 563cf3e Author: Pascal Andy <[email protected]> Date: Mon Dec 17 14:34:31 2018 -0500 traefik 1.7.6 commit 0048084 Author: Pascal Andy <[email protected]> Date: Mon Dec 17 14:29:40 2018 -0500 caddy updates commit 4a40cd4 Author: Pascal Andy <[email protected]> Date: Mon Dec 17 14:24:13 2018 -0500 caddy updates commit 3c1eb0a Author: Pascal Andy <[email protected]> Date: Mon Dec 17 14:20:18 2018 -0500 caddy updats commit c0a51bf Author: Pascal Andy <[email protected]> Date: Mon Dec 17 14:19:22 2018 -0500 using a new html template commit 5bbd684 Author: Pascal Andy <[email protected]> Date: Mon Dec 17 14:16:49 2018 -0500 volume absolut path commit 147bbe1 Author: Pascal Andy <[email protected]> Date: Mon Dec 17 14:11:39 2018 -0500 volume absolut path commit ab982b5 Author: Pascal Andy <[email protected]> Date: Mon Dec 17 14:07:22 2018 -0500 caddy wip commit 61f8b86 Author: Pascal Andy <[email protected]> Date: Mon Dec 17 13:59:37 2018 -0500 update caddy image (the previous one was a bad build) commit 5a6a378 Author: Pascal Andy <[email protected]> Date: Sun Dec 16 18:05:18 2018 -0500 using -2200-polodepth 1 commit 98c9c68 Author: Pascal Andy <[email protected]> Date: Thu Dec 13 16:14:57 2018 -0500 wordpress5 testing /d commit 016c675 Author: Pascal Andy <[email protected]> Date: Thu Dec 13 16:13:02 2018 -0500 wordpress5 testing /c commit 9e23535 Author: Pascal Andy <[email protected]> Date: Thu Dec 13 16:03:57 2018 -0500 wordpress5 testing /b commit 284f28b Author: Pascal Andy <[email protected]> Date: Thu Dec 13 16:02:48 2018 -0500 wordpress5 testing commit 6c21d54 Author: Pascal Andy <[email protected]> Date: Fri Dec 7 00:42:15 2018 -0500 caddyfire /er commit 9997012 Author: Pascal Andy <[email protected]> Date: Fri Dec 7 00:37:00 2018 -0500 caddyfire /d commit c951fdc Author: Pascal Andy <[email protected]> Date: Fri Dec 7 00:34:06 2018 -0500 caddyfire /c commit 2d4a5af Author: Pascal Andy <[email protected]> Date: Fri Dec 7 00:27:25 2018 -0500 README /b Signed-off-by: Pascal Andy <[email protected]> commit 315421d Author: Pascal Andy <[email protected]> Date: Fri Dec 7 00:26:06 2018 -0500 README update commit 8785b57 Author: Pascal Andy <[email protected]> Date: Fri Dec 7 00:24:10 2018 -0500 bump to devmtl/caddyfire:0.11.1-d Signed-off-by: Pascal Andy <[email protected]> Signed-off-by: Pascal Andy <[email protected]>
1 parent 5b23c4d commit 6081c13

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+167
-33265
lines changed

CHANGELOG.md

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11

22
# Changelog
33

4+
## 1.54
5+
d2b3a5fa readme udpate
6+
bump to caddy 0.11.1
7+
bump to traefik 1.7.6
8+
remove static files for webapps
9+
410
## 1.53
5-
- wip
11+
- Added portainer with its agent
612

713
## 1.52
814
- fixed minimum memory requirement from 1M to 4M

play-with-docker-setup.sh

+12-12
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@
33
# This script is made to run on a fresh play-with-docker node
44

55
# On play-with-docker, install common apps
6-
apk update && apk upgrade && apk add --no-cache \
7-
nano bash git curl wget unzip openssl tar tzdata \
8-
ca-certificates && \
6+
apk update && apk upgrade && apk add --no-cache \
7+
nano bash git curl wget unzip openssl tar tzdata \
8+
ca-certificates && \
99

1010
# On play-with-docker, set local time
11-
cp /usr/share/zoneinfo/America/New_York /etc/localtime && \
12-
echo "America/New_York" > /etc/timezone && \
13-
apk del tzdata && \
11+
cp /usr/share/zoneinfo/America/New_York /etc/localtime && \
12+
echo "America/New_York" > /etc/timezone && \
13+
apk del tzdata && \
1414

1515
# On play-with-docker, clean up
16-
rm -rf /var/cache/apk/* /tmp* && sleep 1 && \
16+
rm -rf /var/cache/apk/* /tmp* && sleep 1 && \
1717

1818
# On play-with-docker, create Swarm manager
19-
docker swarm init --advertise-addr $(hostname -i) && \
19+
docker swarm init --advertise-addr $(hostname -i) && \
2020

2121
# On play-with-docker, clone repo
22-
echo && \
23-
cd /root && \
24-
git clone https://github.com/pascalandy/docker-stack-this.git && \
25-
cd docker-stack-this && \
22+
echo && \
23+
cd /root && \
24+
git clone https://github.com/pascalandy/docker-stack-this.git --depth 1 && \
25+
cd docker-stack-this && \
2626
echo;

traefik_stack5/README.md

+19-12
Original file line numberDiff line numberDiff line change
@@ -11,30 +11,34 @@ This docker stack will run many services (Traefik, Socat, Portainer, Nginx, Cadd
1111
#### STABLE setup (recommanded)
1212

1313
```
14-
# --- Setup the stack ---
15-
ENV_STABLE_BRANCH="master"
16-
ENV_MONOREPO="traefik_stack5"
14+
echo "CONFIGURE ENV_VAR" && \
15+
ENV_STABLE_BRANCH="master";
16+
ENV_MONOREPO="traefik_stack5";
1717
18-
# --- Setup the stack ---
18+
echo "Setup the stack" && \
1919
source <(curl -s https://raw.githubusercontent.com/pascalandy/docker-stack-this/master/play-with-docker-setup.sh) && \
2020
sleep 2 && \
21+
2122
git checkout "$ENV_STABLE_BRANCH" && \
2223
cd "$ENV_MONOREPO" && \
24+
2325
./runup.sh;
2426
```
2527

2628
#### EDGE setup (not recommanded)
2729

2830
```
29-
# --- Setup the stack ---
30-
ENV_EDGE_BRANCH="1.53"
31-
ENV_MONOREPO="traefik_stack5"
31+
echo "CONFIGURE ENV_VAR" && \
32+
ENV_EDGE_BRANCH="1.54";
33+
ENV_MONOREPO="traefik_stack5";
3234
33-
# --- Setup the stack ---
35+
echo "Setup the stack" && \
3436
source <(curl -s https://raw.githubusercontent.com/pascalandy/docker-stack-this/master/play-with-docker-setup.sh) && \
3537
sleep 2 && \
38+
3639
git checkout "$ENV_EDGE_BRANCH" && \
3740
cd "$ENV_MONOREPO" && \
41+
3842
./runup.sh;
3943
```
4044

@@ -82,21 +86,24 @@ http://pwd10-0-7-3-80.host1.labs.play-with-docker.com/portainer/
8286

8387
The container for the first URL is actually named `home`.
8488

85-
8689
#### Web apps details:
87-
- **/** = [caddy](https://hub.docker.com/r/abiosoft/caddy/)
88-
- **/who1/** = [nginx](https://hub.docker.com/_/nginx/)
90+
- **/** = [caddy](https://github.com/pascalandy/caddy-securityheader)
91+
- **/who1/** = [caddy](https://github.com/pascalandy/caddy-securityheader)
8992
- **/who2/** = [whoami](https://hub.docker.com/r/emilevauge/whoami/)
9093
- **/portainer/** = [portainer](https://hub.docker.com/r/portainer/portainer/)
9194

9295
Portainer requires a slash `/` at the end of the path. There is something to tweak with Traefik Labels in order for it to accept the proxy the request without the slash `/` at the end.
9396

97+
#### About Caddy
98+
99+
I made a solid container out of it. See details:
100+
https://github.com/pascalandy/caddy-securityheader
101+
94102
#### Anything special about this mono repo?
95103

96104
- This stack does not use ACME (https://). ACME is a pain while developping … reaching limits, etc.
97105
- If you don’t want to use socat, checkout the monorepo `traefik-manager-noacme`
98106

99-
100107
## Screenshots
101108

102109
![docker-stack-this-stack5_11](https://user-images.githubusercontent.com/6694151/34073735-76c60ae2-e26e-11e7-85a1-755a7177b3f2.jpg)

traefik_stack5/bash-setup.md

-107
This file was deleted.

traefik_stack5/runup.sh

+73-81
Original file line numberDiff line numberDiff line change
@@ -80,87 +80,79 @@ function main() {
8080
# --- edit YOUR SCRIPT HERE
8181
function goto_myscript() {
8282

83-
# play-with-docker is ready
84-
docker run --rm devmtl/figlet:1.0 lauching stacks; sleep 2; echo;
85-
86-
# Stop
87-
echo; echo "If existing, remove stacks: "
88-
./rundown.sh
89-
90-
# Create Network
91-
echo; echo "If not existing, create our network: "
92-
93-
NTW_FRONT="ntw_front"
94-
95-
if [ ! "$(docker network ls --filter name=${NTW_FRONT} -q)" ]; then
96-
docker network create --driver overlay --attachable --opt encrypted "${NTW_FRONT}"
97-
echo "Network: ${NTW_FRONT} was created."
98-
else
99-
echo "Network: ${NTW_FRONT} already exist."
100-
fi
101-
102-
NTW_PROXY="ntw_proxy"
103-
104-
if [ ! "$(docker network ls --filter name=${NTW_PROXY} -q)" ]; then
105-
docker network create --driver overlay --attachable --opt encrypted "${NTW_PROXY}"
106-
echo "Network: ${NTW_PROXY} was created."
107-
else
108-
echo "Network: ${NTW_PROXY} already exist."
109-
fi
110-
111-
echo; echo "Show network..."
112-
docker network ls | grep "ntw_"
113-
echo; echo; sleep 2
114-
115-
# The Stack
116-
echo "Start the stacks ..."; echo; echo;
117-
118-
# traefik
119-
docker stack deploy toolproxy -c toolproxy.yml
120-
echo; sleep 1;
121-
122-
# webapps
123-
docker stack deploy toolwebapp -c toolwebapp.yml
124-
echo; sleep 1;
125-
126-
# testing as there is now an official stack
127-
# https://portainer.readthedocs.io/en/stable/deployment.html#inside-a-swarm-cluster
128-
docker stack deploy toolgui -c toolportainer.yml
129-
echo; sleep 1;
130-
131-
# wordpress
132-
# the system is path is at ./docker-stack5
133-
#_MYSQL_DIR="$(pwd)/html/db/mysql"
134-
#mkdir -p "$_MYSQL_DIR"
135-
136-
#docker stack deploy toolwp -c toolwp.yml
137-
echo; sleep 1;
138-
139-
# List
140-
echo; echo "docker stack ls ..."
141-
docker stack ls;
142-
echo; echo ; sleep 2
143-
144-
145-
# Follow deployment in real time
146-
#watch docker service ls
147-
echo; echo;
148-
149-
MIN="1"
150-
MAX="8"
151-
for ACTION in $(seq ${MIN} ${MAX}); do
152-
echo
153-
echo "docker service ls | Check ${ACTION}" of ${MAX}; echo;
154-
docker service ls && echo && sleep 2;
155-
done
156-
echo; echo ; sleep 2
157-
158-
# See Traefik logs
159-
echo "To see Traefik logs type: "; sleep 1;
160-
echo " docker service logs -f toolproxy_traefik"; echo; sleep 1;
161-
162-
# play-with-docker is ready
163-
docker run --rm devmtl/figlet:1.0 Your turn; echo;
83+
# play-with-docker is ready
84+
docker run --rm devmtl/figlet:1.0 lauching stacks; sleep 2; echo;
85+
86+
# Stop
87+
echo; echo "If existing, remove stacks: "
88+
./rundown.sh
89+
90+
# Create Network
91+
echo; echo "If not existing, create our network: "
92+
93+
NTW_FRONT="ntw_front"
94+
if [ ! "$(docker network ls --filter name=${NTW_FRONT} -q)" ]; then
95+
docker network create --driver overlay --attachable --opt encrypted "${NTW_FRONT}"
96+
echo "Network: ${NTW_FRONT} was created."
97+
else
98+
echo "Network: ${NTW_FRONT} already exist."
99+
fi
100+
101+
NTW_PROXY="ntw_proxy"
102+
if [ ! "$(docker network ls --filter name=${NTW_PROXY} -q)" ]; then
103+
docker network create --driver overlay --attachable --opt encrypted "${NTW_PROXY}"
104+
echo "Network: ${NTW_PROXY} was created."
105+
else
106+
echo "Network: ${NTW_PROXY} already exist."
107+
fi
108+
109+
echo; echo "Show network...";
110+
docker network ls | grep "ntw_";
111+
echo; echo; sleep 2;
112+
113+
echo "Start the stacks ...";
114+
115+
# traefik
116+
docker stack deploy toolproxy -c toolproxy.yml;
117+
echo; sleep 1;
118+
119+
# webapps
120+
docker stack deploy toolwebapp -c toolwebapp.yml;
121+
echo; sleep 1;
122+
123+
# gui
124+
docker stack deploy toolgui -c toolportainer.yml;
125+
echo; sleep 1;
126+
127+
# wordpress
128+
# the system is path is at ./docker-stack5
129+
#_MYSQL_DIR="$(pwd)/html/db/mysql"
130+
#mkdir -p "$_MYSQL_DIR"
131+
132+
#docker stack deploy toolwp -c toolwp.yml
133+
echo; sleep 1;
134+
135+
# List
136+
echo; echo;
137+
docker service ls && echo && sleep 2;
138+
139+
# Follow deployment in real time
140+
141+
MIN="1"
142+
MAX="10"
143+
for ACTION in $(seq ${MIN} ${MAX}); do
144+
echo
145+
echo "docker service ls | Check ${ACTION}" of ${MAX}; echo;
146+
docker service ls && echo && sleep 2;
147+
done
148+
echo; echo ; sleep 2
149+
150+
# See Traefik logs
151+
echo "To see Traefik logs type: "; sleep 1;
152+
echo " docker service logs -f toolproxy_traefik"; echo; sleep 1;
153+
154+
# play-with-docker is ready
155+
docker run --rm devmtl/figlet:1.0 Your turn; echo;
164156

165157
}
166158

0 commit comments

Comments
 (0)