Skip to content

Commit a10c87a

Browse files
committed
updating post-dockercon
1 parent cb411cc commit a10c87a

10 files changed

+163
-6
lines changed

.gitignore

+134
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
posta
2+
postb
3+
4+
5+
# Created by https://www.gitignore.io/api/vim,macos,windows
6+
7+
### macOS ###
8+
*.DS_Store
9+
.AppleDouble
10+
.LSOverride
11+
12+
# Icon must end with two \r
13+
Icon
14+
15+
# Thumbnails
16+
._*
17+
18+
# Files that might appear in the root of a volume
19+
.DocumentRevisions-V100
20+
.fseventsd
21+
.Spotlight-V100
22+
.TemporaryItems
23+
.Trashes
24+
.VolumeIcon.icns
25+
.com.apple.timemachine.donotpresent
26+
27+
# Directories potentially created on remote AFP share
28+
.AppleDB
29+
.AppleDesktop
30+
Network Trash Folder
31+
Temporary Items
32+
.apdisk
33+
34+
### Vim ###
35+
# swap
36+
.sw[a-p]
37+
.*.sw[a-p]
38+
# session
39+
Session.vim
40+
# temporary
41+
.netrwhist
42+
*~
43+
# auto-generated tag files
44+
tags
45+
46+
### Windows ###
47+
# Windows thumbnail cache files
48+
Thumbs.db
49+
ehthumbs.db
50+
ehthumbs_vista.db
51+
52+
# Folder config file
53+
Desktop.ini
54+
55+
# Recycle Bin used on file shares
56+
$RECYCLE.BIN/
57+
58+
# Windows Installer files
59+
*.cab
60+
*.msi
61+
*.msm
62+
*.msp
63+
64+
# Windows shortcuts
65+
*.lnk
66+
67+
68+
# End of https://www.gitignore.io/api/vim,macos,windows
69+
70+
# Created by https://www.gitignore.io/api/vim,macos,windows
71+
72+
### macOS ###
73+
*.DS_Store
74+
.AppleDouble
75+
.LSOverride
76+
77+
# Icon must end with two \r
78+
Icon
79+
80+
# Thumbnails
81+
._*
82+
83+
# Files that might appear in the root of a volume
84+
.DocumentRevisions-V100
85+
.fseventsd
86+
.Spotlight-V100
87+
.TemporaryItems
88+
.Trashes
89+
.VolumeIcon.icns
90+
.com.apple.timemachine.donotpresent
91+
92+
# Directories potentially created on remote AFP share
93+
.AppleDB
94+
.AppleDesktop
95+
Network Trash Folder
96+
Temporary Items
97+
.apdisk
98+
99+
### Vim ###
100+
# swap
101+
.sw[a-p]
102+
.*.sw[a-p]
103+
# session
104+
Session.vim
105+
# temporary
106+
.netrwhist
107+
*~
108+
# auto-generated tag files
109+
tags
110+
111+
### Windows ###
112+
# Windows thumbnail cache files
113+
Thumbs.db
114+
ehthumbs.db
115+
ehthumbs_vista.db
116+
117+
# Folder config file
118+
Desktop.ini
119+
120+
# Recycle Bin used on file shares
121+
$RECYCLE.BIN/
122+
123+
# Windows Installer files
124+
*.cab
125+
*.msi
126+
*.msm
127+
*.msp
128+
129+
# Windows shortcuts
130+
*.lnk
131+
132+
133+
# End of https://www.gitignore.io/api/vim,macos,windows
134+

README.md

+16-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@ A Docker Swarm cluster needs more then just your app running, it often needs at
1313

1414
This demo is meant for you to `git clone` and run locally to help you learn the tools and methods for building a complete Docker Swarm cluster.
1515

16+
# Major To-Do's left
17+
18+
- [ ] Pull out everything that needs envvars
19+
- [ ] Use Docker Swarm Secrets for privates
20+
- [ ] Fix Docker EE Ansible permissions on ELB's and Security groups for port 8080 (app ELB)
21+
- [ ] Better README step-by-step
22+
- [ ] Walkthough videos
23+
1624
## Getting Started
1725

1826
This repo holds two deployment examples for Docker Swarm
@@ -31,7 +39,14 @@ You can do all this locally on a single node or optionally using Docker Machine
3139
The scripts and compose/stack files use variables to make this demo easier to get started. Set these at your shell before running commands
3240

3341
```
34-
TODO: add envs
42+
# for Digital Ocean docker-machine driver
43+
SSH_FINGERPRINT #fingerprint used to match your SSH key to Digital Ocean's
44+
DO_SIZE #instance size for Digital Ocean to use for docker-machine
45+
DO_TOKEN #Digital Ocean API token for creating/deleting droplets
46+
47+
# for Digital Ocean block storage
48+
REXRAY_DO_TOKEN #Digital Ocean API token so RexRay can create storage volumes, can be same as DO_TOKEN
49+
3550
```
3651

3752
### Step 2: (single node local Swarm)

dci-aws/.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ docker_subscription.lic
55
inventory/1.hosts
66

77
# ansible resources
8-
group_vars/all
8+
all
99
.logs
1010

1111
# client bundles

delete-servers.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ docker-machine rm -y dvc${server} &
77
done
88

99
# delete all storage in DO (be sure you are ok deleting ALL storage in an account)
10-
doctl compute volume ls --format ID --no-header | while read -r id; do doctl compute volume rm -f "$id"; done
10+
# doctl compute volume ls --format ID --no-header | while read -r id; do doctl compute volume rm -f "$id"; done
1111

1212

1313

generate-some-votes.sh

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
#!/bin/sh
22

3+
# this short script will post some HTTP data to the Voting app to generate votes
4+
# this makes for a better demo and if you can see the results then you know the solution works
5+
36
# create POST data files with ab friendly formats
47
python make-data.py
58

hash-config-secret.sh

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
#!/bin/sh
22
set -x
33

4+
# this is part of a solution to Swarm Stack Configs that change
5+
# TODO: explain how this works in readme
6+
47
export LOGSTASH_CONF=$(shasum logstash.conf -a 512 | cut -c1-16)
58

old-stack-proxy.yml

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
version: '3.3'
22

3+
# this is an alternate proxy setup using haproxy
4+
35
services:
46

57
proxy:

secret-ghost-db

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
OpdP2dy4jzAT
1+
YOURDBPASSWORDhere

stack-ee-ghost.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ services:
99
database__client: mysql
1010
database__connection__host: db
1111
database__connection__user: root
12-
database__connection__password: OpdP2dy4jzAT
12+
database__connection__password: YOURDBPASSWORDhere
1313
database__connection__database: ghost
1414
url: http://ghost.dogvscat.biz
1515
deploy:

stack-ghost.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ services:
1212
database__client: mysql
1313
database__connection__host: db
1414
database__connection__user: root
15-
database__connection__password: OpdP2dy4jzAT
15+
database__connection__password: YOURDBPASSWORDhere
1616
database__connection__database: ghost
1717
url: http://ghost.dogvs.cat
1818
deploy:

0 commit comments

Comments
 (0)