Skip to content

Commit 8823217

Browse files
committed
bump to 1.51 / update memory defaults
commit 6690a77 Author: Pascal Andy <pascal@firepress.org> Date: Tue Dec 4 17:42:35 2018 -0500 update memory defaults commit 6ce29b3 Author: Pascal Andy <pascal@firepress.org> Date: Tue Dec 4 12:59:13 2018 -0500 minor /a Signed-off-by: Pascal Andy <pascal@firepress.org> Signed-off-by: Pascal Andy <pascal@firepress.org>
1 parent 18a5f49 commit 8823217

File tree

4 files changed

+17
-16
lines changed

4 files changed

+17
-16
lines changed

play-with-docker-setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ echo "America/New_York" > /etc/timezone && \
1313
apk del tzdata && \
1414

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

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

traefik_stack5/README.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22

33
This docker stack will run many services (Traefik, 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.
44

5+
56
## Start here
67
1. Go to http://labs.play-with-docker.com/
7-
2. Create **one instance*. Wait for the node to provision
8-
3. On **node1**, copy paste:
8+
2. Create *one instance*. Wait for the node to provision
9+
3. Copy-paste:
910

1011
```
1112
ENV_STABLE_BRANCH="1.50"
12-
ENV_EDGE_BRANCH="1.50"
13+
ENV_EDGE_BRANCH="1.51"
1314
ENV_MONOREPO="traefik_stack5"
1415
1516
# setup the stack
@@ -21,7 +22,7 @@ cd "$ENV_MONOREPO" && \
2122
./runup.sh;
2223
```
2324

24-
The script `runup.sh` will do the hard work for us :) Once deployed, you will see:
25+
The script `runup.sh` will do the hard and deplo the stacks for us. Once deployed, you will see:
2526

2627

2728
#### See your stacks
@@ -107,7 +108,7 @@ In the active path, just execute those bash-scripts:
107108

108109

109110
#### Traefik version
110-
In `toolproxy.yml` look for something like `traefik:1.5.0`.
111+
In `toolproxy.yml` look for something like `traefik:1.7.4`.
111112

112113
In some mono-repo I **my own traefik image**. Feel free to use the official images. It will not break anything.
113114

traefik_stack5/toolproxy.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ services:
2828
resources:
2929
limits:
3030
cpus: '0.20'
31-
memory: 16M
31+
memory: 8M
3232
reservations:
3333
cpus: '0.10'
34-
memory: 8M
34+
memory: 1M
3535
labels:
3636
- "traefik.enable=false"
3737

@@ -80,10 +80,10 @@ services:
8080
resources:
8181
limits:
8282
cpus: '0.33'
83-
memory: 128M
83+
memory: 96M
8484
reservations:
8585
cpus: '0.05'
86-
memory: 64M
86+
memory: 48M
8787
labels:
8888
- "traefik.backend=traefik"
8989
- "traefik.enable=true"

traefik_stack5/toolwebapp.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ services:
1919
resources:
2020
limits:
2121
cpus: '0.20'
22-
memory: 20M
22+
memory: 18M
2323
reservations:
2424
cpus: '0.20'
25-
memory: 8M
25+
memory: 6M
2626
labels:
2727
- "traefik.frontend.rule=PathPrefixStrip:/"
2828
- "traefik.backend=home"
@@ -52,10 +52,10 @@ services:
5252
resources:
5353
limits:
5454
cpus: '0.20'
55-
memory: 20M
55+
memory: 18M
5656
reservations:
5757
cpus: '0.05'
58-
memory: 8M
58+
memory: 6M
5959
labels:
6060
- "traefik.frontend.rule=PathPrefixStrip:/who1"
6161
- "traefik.backend=who1"
@@ -83,10 +83,10 @@ services:
8383
resources:
8484
limits:
8585
cpus: '0.20'
86-
memory: 20M
86+
memory: 8M
8787
reservations:
8888
cpus: '0.05'
89-
memory: 8M
89+
memory: 1M
9090
labels:
9191
- "traefik.frontend.rule=PathPrefixStrip:/who2"
9292
- "traefik.backend=who2"

0 commit comments

Comments
 (0)