Skip to content

Commit 96c00e4

Browse files
committed
bump to 1.4.9
commit e400b36 Author: Pascal Andy <[email protected]> Date: Tue Dec 4 11:49:07 2018 -0500 changelog update commit 8fad4e8 Author: Pascal Andy <[email protected]> Date: Tue Dec 4 11:45:07 2018 -0500 update Caddy image commit 1f6f27e Author: Pascal Andy <[email protected]> Date: Tue Dec 4 11:42:34 2018 -0500 Adding a socat proxy network / best practice /e commit 72b04bd Author: Pascal Andy <[email protected]> Date: Tue Dec 4 11:41:27 2018 -0500 Adding a socat proxy network / best practice /d commit db021ad Author: Pascal Andy <[email protected]> Date: Tue Dec 4 11:39:40 2018 -0500 Adding a socat proxy network / best practice /c commit 2329e8a Author: Pascal Andy <[email protected]> Date: Tue Dec 4 11:37:59 2018 -0500 Adding a socat proxy network / best practice /b commit 1ca58b3 Author: Pascal Andy <[email protected]> Date: Tue Dec 4 11:33:39 2018 -0500 adding a scoat network / best practice /a commit c21c893 Author: Pascal Andy <[email protected]> Date: Tue Dec 4 11:20:37 2018 -0500 bump to traefik 1.7.5 + socat edge commit 588f983 Author: Pascal Andy <[email protected]> Date: Sun Nov 25 23:03:38 2018 -0500 bump to traefik 1.7.4 commit eb50d6c Author: Pascal Andy <[email protected]> Date: Sun Nov 25 22:27:12 2018 -0500 added swarmdash /c commit 416682f Author: Pascal Andy <[email protected]> Date: Sun Nov 25 22:26:38 2018 -0500 added swarmdash /b commit 1830421 Author: Pascal Andy <[email protected]> Date: Sun Nov 25 22:24:02 2018 -0500 added swarmdash.yml commit 5a669fd Author: Pascal Andy <[email protected]> Date: Fri Sep 14 16:39:44 2018 -0400 update to DEV branch 1.49 Signed-off-by: Pascal Andy <[email protected]>
1 parent 2acd71c commit 96c00e4

File tree

210 files changed

+54
-58008
lines changed

Some content is hidden

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

210 files changed

+54
-58008
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11

22
# Changelog
33

4+
## 1.49
5+
- update to traefik 1.7.5
6+
- rebuild socatproxy from alpine:3.8
7+
- Add a ntw_proxy network
8+
- various code cleaning
9+
- removed DIR traefik_stack6-wip
10+
411
## 1.48
512
- Fix trailing ‘/‘ issue for portainer
613

traefik_stack5/README-dev.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
RUN script inspiration
2+
3+
https://github.com/Jigsaw-Code/outline-server/tree/master/src/shadowbox#self-hosted-installation

traefik_stack5/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ This docker stack will run many services (Traefik, Socat, Portainer, Nginx, Cadd
88
3. On **node1**, copy paste:
99

1010
```
11-
ENV_BRANCH=1.48
11+
ENV_BRANCH=1.49
1212
ENV_MONOREPO=traefik_stack5
1313
1414
# Setup alpine node and docker swarm

traefik_stack5/runctop.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,5 @@ docker run --rm -ti \
1515
-v /var/run/docker.sock:/var/run/docker.sock:ro \
1616
quay.io/vektorlab/ctop:latest
1717

18-
# by Pascal Andy | # https://twitter.com/askpascalandy
19-
# https://github.com/pascalandy/docker-stack-this
20-
#
18+
# by Pascal Andy | https://pascalandy.com/
19+
# https://github.com/pascalandy/docker-stack-this

traefik_stack5/rundown.sh

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,11 @@ docker stack rm toolweb || true; echo; sleep 1;
1616

1717
docker stack rm toolmonitor || true; echo; sleep 1;
1818

19-
# docker stack rm toolwp || true; echo; sleep 1;
20-
21-
22-
#docker stack rm proxpress || true; echo; sleep 1;
23-
2419
#echo; echo "Remove network ..."
2520
#docker network rm ntw_front
2621

2722
#echo; echo "Clean up ..."
2823
#docker system prune -f
2924

30-
# by Pascal Andy | # https://twitter.com/askpascalandy
31-
# https://github.com/pascalandy/docker-stack-this
32-
#
25+
# by Pascal Andy | https://pascalandy.com/
26+
# https://github.com/pascalandy/docker-stack-this

traefik_stack5/runup.sh

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,22 @@ echo; echo "If existing, remove stacks: "
1616
# Create Network
1717
echo; echo "If not existing, create our network: "
1818

19-
NTW_FRONT=ntw_front
19+
NTW_FRONT="ntw_front"
2020

21-
if [ ! "$(docker network ls --filter name=$NTW_FRONT -q)" ]; then
22-
docker network create --driver overlay --attachable --opt encrypted "$NTW_FRONT"
23-
echo "Network: $NTW_FRONT was created."
21+
if [ ! "$(docker network ls --filter name=${NTW_FRONT} -q)" ]; then
22+
docker network create --driver overlay --attachable --opt encrypted "${NTW_FRONT}"
23+
echo "Network: ${NTW_FRONT} was created."
2424
else
25-
echo "Network: $NTW_FRONT already exist."
25+
echo "Network: ${NTW_FRONT} already exist."
26+
fi
27+
28+
NTW_PROXY="ntw_proxy"
29+
30+
if [ ! "$(docker network ls --filter name=${NTW_PROXY} -q)" ]; then
31+
docker network create --driver overlay --attachable --opt encrypted "${NTW_PROXY}"
32+
echo "Network: ${NTW_PROXY} was created."
33+
else
34+
echo "Network: ${NTW_PROXY} already exist."
2635
fi
2736

2837
echo; echo "Show network..."
@@ -37,7 +46,7 @@ docker stack deploy toolproxy -c toolproxy.yml
3746
echo; echo; sleep 2
3847

3948
# webapps
40-
docker stack deploy toolweb -c toolweb.yml
49+
docker stack deploy toolwebapp -c toolwebapp.yml
4150
echo; echo; sleep 2
4251

4352
# portainer
@@ -63,11 +72,11 @@ echo; echo ; sleep 2
6372
#watch docker service ls
6473
echo; echo;
6574

66-
MIN=1
67-
MAX=8
68-
for ACTION in $(seq $MIN $MAX); do
75+
MIN="1"
76+
MAX="8"
77+
for ACTION in $(seq ${MIN} ${MAX}); do
6978
echo
70-
echo "docker service ls | Check $ACTION" of $MAX; echo;
79+
echo "docker service ls | Check ${ACTION}" of ${MAX}; echo;
7180
docker service ls && echo && sleep 2;
7281
done
7382
echo; echo ; sleep 2
@@ -76,5 +85,5 @@ echo; echo ; sleep 2
7685
echo "To see Traefik logs type: "; sleep 1;
7786
echo " docker service logs -f toolproxy_traefik"; echo; sleep 1;
7887

79-
# by Pascal Andy | # https://twitter.com/askpascalandy
88+
# by Pascal Andy | https://pascalandy.com/
8089
# https://github.com/pascalandy/docker-stack-this

traefik_stack5/toolportainer-WIP.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ volumes:
6060
portainer_data:
6161

6262
# potential setup https://github.com/portainer/portainer/issues/461
63-
6463
# Inspired from https://github.com/portainer/portainer-compose/blob/master/docker-stack.yml
65-
# by Pascal Andy | # https://twitter.com/askpascalandy
66-
# https://github.com/pascalandy/docker-stack-this
64+
65+
# by Pascal Andy | https://pascalandy.com/
66+
# https://github.com/pascalandy/docker-stack-this

traefik_stack5/toolportainer.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ networks:
4444
external: true
4545

4646
# potential setup https://github.com/portainer/portainer/issues/461
47-
4847
# Inspired from https://github.com/portainer/portainer-compose/blob/master/docker-stack.yml
49-
# by Pascal Andy | # https://twitter.com/askpascalandy
48+
49+
# by Pascal Andy | https://pascalandy.com/
5050
# https://github.com/pascalandy/docker-stack-this

traefik_stack5/toolproxy.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ version: '3.3'
33
networks:
44
ntw_front:
55
external: true
6+
ntw_proxy:
7+
external: true
68

79
configs:
810
traefik.toml:
@@ -11,9 +13,10 @@ configs:
1113
services:
1214

1315
socat:
14-
image: devmtl/socatproxy:1.0B
16+
image: devmtl/socatproxy:1.1
1517
networks:
1618
- ntw_front
19+
- ntw_proxy
1720
volumes:
1821
- /var/run/docker.sock:/var/run/docker.sock:ro
1922
deploy:
@@ -33,18 +36,23 @@ services:
3336
- "traefik.enable=false"
3437

3538
traefik:
36-
image: traefik:1.6.6-alpine
39+
image: traefik:1.7.5-alpine
3740
ports:
3841
- target: 80
3942
protocol: tcp
4043
published: 80
4144
mode: ingress
45+
- target: 443
46+
protocol: tcp
47+
published: 443
48+
mode: ingress
4249
- target: 8080
4350
protocol: tcp
4451
published: 8080
4552
mode: ingress
4653
networks:
4754
- ntw_front
55+
- ntw_proxy
4856
configs:
4957
- source: traefik.toml
5058
target: /etc/traefik/traefik.toml
@@ -87,5 +95,5 @@ services:
8795
- "traefik.backend.loadbalancer.swarm=true"
8896

8997

90-
# by Pascal Andy | # https://twitter.com/askpascalandy
98+
# by Pascal Andy | https://pascalandy.com/
9199
# https://github.com/pascalandy/docker-stack-this

traefik_stack5/toolweb.yml renamed to traefik_stack5/toolwebapp.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: "3.1"
33
services:
44

55
home:
6-
image: abiosoft/caddy:0.10.14
6+
image: devmtl/caddyfire:0.11.1-B
77
networks:
88
- ntw_front
99
volumes:
@@ -105,5 +105,5 @@ networks:
105105

106106
# With a real domain name you will need "traefik.frontend.rule=Host:mydummysite.tk"
107107
#
108-
# by Pascal Andy | # https://twitter.com/askpascalandy
109-
# https://github.com/pascalandy/docker-stack-this
108+
# by Pascal Andy | https://pascalandy.com/
109+
# https://github.com/pascalandy/docker-stack-this

0 commit comments

Comments
 (0)