Skip to content

Commit acefbd7

Browse files
pascalandypascalandy
committed
Update to Traefik V2 / DIR traefik_stack6 / squashed
1 parent b21424e commit acefbd7

Some content is hidden

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

45 files changed

+5199
-948
lines changed

‎.dockerignore‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
.cache
2+
coverage
3+
dist
4+
node_modules
5+
npm-debug
6+
.git
7+

‎.gitignore‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
1-
# .gitignore
1+
# Files
22
############
3+
.bashcheck.sh
4+
utility.sh
5+
test
6+
.cache
7+
coverage
8+
dist
39
node_modules
10+
npm-debug
411
.env
12+
var-config.sh
513

614
# Directories
715
############
8-
9-
# Files
10-
############
11-
var-config.sh
16+
/tmp
17+
/temp
1218

1319
# Compiled source #
1420
###################
@@ -98,3 +104,4 @@ TheVolumeSettingsFolder
98104
.FBCIndex
99105
.FBCSemaphoreFile
100106
.FBCLockFolder
107+

‎ARCHIVE/toolportainer-WIP.yml‎

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

‎CHANGELOG.md‎

Lines changed: 70 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,82 @@ https://gist.github.com/pascalandy/af709db02d3fe132a3e6f1c11b934fe4
1818
---
1919

2020
# Releases
21+
22+
## 1.7.20
23+
### ⚡️ Updates
24+
- a171eac Updated to version: 1.7.20
25+
- 55e47c4 update traefik:1.7.20
26+
- 1a12f35 copy updates
27+
- 36cba80 reset traefik_stack6 directory
28+
- b3d7e3c Merge branch 'master' into edge
29+
30+
## 1.7.19
31+
### ⚡️ Updates
32+
ee52e50 Add dockerignore
33+
e71e452 update to 1.7.19
34+
703087c update to 1.7.18
35+
d1bdd91 update to 1.7.17
36+
31dc46a update to 1.7.16
37+
2100493 update to 1.7.15
38+
d813a66 update to 1.7.14
39+
7f545f8 rollback from 1.7.13
40+
b2775e3 Testing 1.7.19 /d
41+
c3d4979 Testing 1.7.19 /c
42+
334ed02 Testing 1.7.19 /b
43+
09f154b using branch edge instead of dev when developping
44+
37d1783 better template for gitognore
45+
74fedae update to traefik:1.7.19
46+
c976e59 simple linting
47+
dc0aa7b rollback to 1.7.12
48+
ba856bc add ping
49+
970af4a Better UX
50+
be60c96 Fix stack’s name
51+
d4643fd update to traefik 1.7.14
52+
7af3a62 removed / its part of traefik_stack5
53+
25306fb remove ToDo as it is managed in github issues
54+
d78dcea cleaner script
55+
b21424e Init / env-template
2156
## 2.3.0
2257
### ⚡️ Updates
2358
- 6c559e20 update to traefik:1.7.13
2459
- various scripts updates
2560

2661
# Releases
62+
63+
## 1.7.20
64+
### ⚡️ Updates
65+
a171eac Updated to version: 1.7.20
66+
55e47c4 update traefik:1.7.20
67+
1a12f35 copy updates
68+
36cba80 reset traefik_stack6 directory
69+
b3d7e3c Merge branch 'master' into edge
70+
71+
## 1.7.19
72+
### ⚡️ Updates
73+
ee52e50 Add dockerignore
74+
e71e452 update to 1.7.19
75+
703087c update to 1.7.18
76+
d1bdd91 update to 1.7.17
77+
31dc46a update to 1.7.16
78+
2100493 update to 1.7.15
79+
d813a66 update to 1.7.14
80+
7f545f8 rollback from 1.7.13
81+
b2775e3 Testing 1.7.19 /d
82+
c3d4979 Testing 1.7.19 /c
83+
334ed02 Testing 1.7.19 /b
84+
09f154b using branch edge instead of dev when developping
85+
37d1783 better template for gitognore
86+
74fedae update to traefik:1.7.19
87+
c976e59 simple linting
88+
dc0aa7b rollback to 1.7.12
89+
ba856bc add ping
90+
970af4a Better UX
91+
be60c96 Fix stack’s name
92+
d4643fd update to traefik 1.7.14
93+
7af3a62 removed / its part of traefik_stack5
94+
25306fb remove ToDo as it is managed in github issues
95+
d78dcea cleaner script
96+
b21424e Init / env-template
2797
## 2.2.3
2898
### 🐛 Fix bug
2999
- 2a253c82 moved proxysocket at the root of the projet
@@ -69,14 +139,12 @@ https://gist.github.com/pascalandy/af709db02d3fe132a3e6f1c11b934fe4
69139
- Better gitignore
70140
- comment about a compose file beeing tested
71141

72-
73142
## 2.00
74143
### ⚡️ Updates
75144
- bump to traefik 1.7.8
76145

77146
p.s. I bump to a major version because in my overall DevOps set up it makes sense. But there is nothing major regarding this particular repo.
78147

79-
80148
## 1.56
81149
### ⚡️ Updates
82150
- bump to traefik 1.7.7
@@ -146,12 +214,10 @@ p.s. I bump to a major version because in my overall DevOps set up it makes sens
146214
- 2c5bd542 bump to portainer:1.17.1
147215
- 19a757d0 bump to traefik:1.6.2-alpine
148216

149-
150217
## 1.43
151218
### ⚡️ Updates
152219
could not work under branch 1.43 weird …
153220

154-
155221
## 1.42
156222
### ⚡️ Updates
157223
- update to traefik 1.6.0
@@ -186,13 +252,11 @@ ac3b2856 minor updates
186252
- Testing wordpress via traefik_stack6-wip
187253
- update to portainer 1.16.5
188254

189-
190255
## bump to 1.40
191256
### ⚡️ Updates
192257
- update to nginx 1.13.10-alpine
193258
- update to caddy 0.10.11
194259

195-
196260
## bump to 1.38
197261
### ⚡️ Updates
198262
commit 8753f097247200e666355c2e4f6d8df83b6f093b

‎Dockerfile‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# The Dockerfile is not a real Dockerfile.
2+
# Those vars are used broadly outside this Dockerfile
3+
# Github Action CI and release script (./utility.sh) is consuming these variables.
4+
ARG VERSION="1.7.20"
5+
ARG APP_NAME="docker-stack-this"
6+
ARG GIT_PROJECT_NAME="docker-stack-this"

‎runversion.sh‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,19 @@ set -o pipefail # Use last non-zero exit code in a pipeline
1010

1111

1212
##################################################
13-
tag_version=$1 && \
13+
# run the script an pass an ARG like '2.3.0'
14+
tag_version=$1
15+
16+
# tag and commit our latest commit
1417
git tag ${tag_version} && \
1518
git push --tags;
1619

17-
# This is specific to my local set up
20+
# load secrets
1821
source .env .
19-
#GITHUB_TOKEN="3122133122133211233211233211233211322313123"
20-
#local_repo="$Users/.../docker-stack-this"
22+
2123
user="pascalandy"
2224
git_repo="docker-stack-this"
25+
GOPATH=$(go env GOPATH)
2326

2427
# Requires https://github.com/aktau/github-release
2528
$GOPATH/bin/github-release release \
@@ -30,5 +33,5 @@ $GOPATH/bin/github-release release \
3033
--description "Refer to [CHANGELOG.md](https://github.com/pascalandy/docker-stack-this/blob/master/CHANGELOG.md) for details about this release."
3134

3235
# Find the latest tag
33-
#tag_version="$(git tag --sort=-creatordate | head -n1)" && \
34-
#echo ${tag_version} && \
36+
# We could add this logic: minor or major. Then the system will manage the SEMVERSION automatically
37+
# tag_version="$(git tag --sort=-creatordate | head -n1)" && echo ${tag_version}

‎to_test/stack-swarmpit.yml‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
version: '3.7'
2+
3+
# https://lunar.computer/posts/docker-swarm-digitalocean/
4+
5+
version: '3.3'
6+
7+
services:
8+
app:
9+
image: swarmpit/swarmpit:1.7
10+
environment:
11+
- SWARMPIT_DB=http://db:5984
12+
volumes:
13+
- /run/docker.sock:/var/run/docker.sock:ro
14+
networks:
15+
- proxy
16+
- net
17+
deploy:
18+
labels:
19+
# traefik v1
20+
- traefik.enable=true
21+
- traefik.backend=swarmpit
22+
- traefik.backend.loadbalancer.swarm=true
23+
- traefik.docker.network=proxy
24+
- traefik.frontend.rule=Host:swarmpit.example.com
25+
- traefik.port=8080
26+
- traefik.frontend.headers.SSLRedirect=true
27+
- traefik.frontend.headers.STSSeconds=315360000
28+
- traefik.frontend.headers.browserXSSFilter=true
29+
- traefik.frontend.headers.contentTypeNosniff=true
30+
- traefik.frontend.headers.forceSTSHeader=true
31+
- traefik.frontend.headers.SSLHost=swarmpit.example.com
32+
- traefik.frontend.headers.STSIncludeSubdomains=true
33+
- traefik.frontend.headers.STSPreload=true
34+
- traefik.frontend.headers.frameDeny=true
35+
resources:
36+
limits:
37+
cpus: '0.50'
38+
memory: 1024M
39+
reservations:
40+
cpus: '0.25'
41+
memory: 512M
42+
placement:
43+
constraints:
44+
- node.role == manager
45+
46+
db:
47+
image: couchdb:2.3.0
48+
volumes:
49+
- dbdata:/opt/couchdb/data
50+
networks:
51+
- net
52+
deploy:
53+
resources:
54+
limits:
55+
cpus: '0.30'
56+
memory: 512M
57+
reservations:
58+
cpus: '0.15'
59+
memory: 256M
60+
61+
agent:
62+
image: swarmpit/agent:latest
63+
environment:
64+
- DOCKER_API_VERSION=1.35
65+
volumes:
66+
- /run/docker.sock:/var/run/docker.sock:ro
67+
networks:
68+
- net
69+
deploy:
70+
mode: global
71+
labels:
72+
swarmpit.agent: 'true'
73+
resources:
74+
limits:
75+
cpus: '0.10'
76+
memory: 64M
77+
reservations:
78+
cpus: '0.05'
79+
memory: 32M
80+
81+
networks:
82+
net:
83+
driver: overlay
84+
attachable: true
85+
proxy:
86+
external: true
87+
88+
volumes:
89+
dbdata:
90+
driver: local

0 commit comments

Comments
 (0)