268 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jerome Petazzoni	ab7c1bb09a	Prepare for LinuxCon EU Berlin	2016-10-01 08:05:55 -07:00
Jérôme Petazzoni	bfcb24c1ca	Merge pull request #45 from anonymuse/jesse/docs_linkfix ... Fix path for README links	2016-09-30 16:22:08 +02:00
Jesse White	45f410bb49	Fix path for README links	2016-09-29 17:22:55 -04:00
Jérôme Petazzoni	bcd2433fa4	Merge branch 'BretFisher-readme-updates'	2016-09-29 00:25:46 +02:00
Jérôme Petazzoni	1d02ddf271	Mess up with whitespace, because I am OCD like that	2016-09-29 00:25:36 +02:00
Jérôme Petazzoni	4765410393	Merge branch 'readme-updates' of https://github.com/BretFisher/orchestration-workshop-with-docker into BretFisher-readme-updates	2016-09-29 00:22:21 +02:00
Bret Fisher	75caa65973	more trainer info	2016-09-28 01:26:56 -04:00
Bret Fisher	dfd2bf4aeb	new example settings file	2016-09-28 01:26:42 -04:00
Bret Fisher	51000b4b4d	better swarm image for cards	2016-09-28 01:26:02 -04:00
Bret Fisher	3acd3b078b	more info for trainers	2016-09-27 13:06:35 -04:00
Bret Fisher	4b43287c5b	more info for trainers	2016-09-27 11:37:42 -04:00
Jerome Petazzoni	c8c745459c	Update stateful section 2016-09-20-velocity	2016-09-19 11:23:23 -07:00
Jerome Petazzoni	04dec2e196	Round of updates for Velocity	2016-09-18 16:20:51 -07:00
Jerome Petazzoni	0f8c189786	Docker Application Bundle -> Distributed Application Bundle	2016-09-18 12:24:47 -07:00
Jerome Petazzoni	81cc14d47b	Fix VM card background image	2016-09-18 12:18:05 -07:00
Jérôme Petazzoni	060b2377d5	Merge pull request #34 from everett-toews/fix-link ... Fix broken link to nomenclature doc	2016-09-11 12:01:24 -05:00
Everett Toews	1e77736987	Fix broken link to nomenclature doc	2016-09-10 15:49:04 -05:00
Jérôme Petazzoni	bf2b4b7eb7	Merge pull request #32 from everett-toews/github-docs ... Move slides to docs for GitHub Pages	2016-09-08 13:56:40 -05:00
Everett Toews	8396f13a4a	Move slides to docs for GitHub Pages	2016-08-27 16:12:25 -05:00
Jerome Petazzoni	571097f369	Small fix 2016-08-25-linuxcon	2016-08-27 13:55:26 -07:00
Jerome Petazzoni	b1110db8ca	Update TOC	2016-08-24 14:01:31 -07:00
Jerome Petazzoni	b73a628f05	Remove old files	2016-08-24 13:52:16 -07:00
Jerome Petazzoni	a07795565d	Update tweet message	2016-08-24 13:50:25 -07:00
Jérôme Petazzoni	c4acbfd858	Add diagram	2016-08-24 16:34:32 -04:00
Jerome Petazzoni	ddbda14e14	Reviews/edits	2016-08-24 13:31:00 -07:00
Jerome Petazzoni	ad4ea8659b	Node management	2016-08-24 08:04:27 -07:00
Jerome Petazzoni	8d7f27d60d	Add Docker Application Bundles ... Capitalize Redis consistently	2016-08-24 06:59:15 -07:00
Jerome Petazzoni	9f21c7279c	Compose build+push	2016-08-23 14:19:14 -07:00
Jerome Petazzoni	53ae221632	Add stateful service section	2016-08-23 11:03:57 -07:00
Jerome Petazzoni	6719bcda87	Update logging section	2016-08-22 15:51:26 -07:00
Jerome Petazzoni	40e0c96c91	Rolling upgrades	2016-08-22 14:21:00 -07:00
Jerome Petazzoni	2c8664e58d	Updated dockercoins deployment instructions	2016-08-12 06:47:30 -07:00
Jerome Petazzoni	1e5cee2456	Updated intro+cluster setup part	2016-08-11 10:01:51 -07:00
Jerome Petazzoni	29b8f53ae0	More typo fixes courtesy of @tiffanyfj	2016-08-11 06:05:43 -07:00
Jérôme Petazzoni	451f68db1d	Update instructions to join cluster	2016-08-10 15:50:30 +02:00
Jérôme Petazzoni	5a4d10ed1a	Upgrade versions to Engine 1.12 + Compose 1.8	2016-08-10 15:50:10 +02:00
Jérôme Petazzoni	06d5dc7846	Merge pull request #29 from programmerq/pssh-command ... detect debian command or upstream command	2016-08-07 15:26:29 +02:00
Jeff Anderson	b63eb0fa40	detect debian command or upstream command	2016-08-01 12:38:12 -06:00
Jérôme Petazzoni	117e2a9ba2	Merge pull request #13 from fiunchinho/master ... Version can be set as env variable to be used, instead of generating unix timestamp	2016-07-11 23:57:13 -05:00
Jerome Petazzoni	d2f6e88fd1	Add -v flag for go get swarmit 2016-06-22-dockercon	2016-06-28 16:47:18 -07:00
Jérôme Petazzoni	c742c39ed9	Merge pull request #26 from beenanner/master ... Upgrade docker-compose files to v2	2016-06-28 06:44:27 -07:00
Jerome Petazzoni	1f2b931b01	Slack -> Gitter	2016-06-22 11:54:47 -07:00
Jerome Petazzoni	e351ede294	Fix TOC	2016-06-22 11:48:00 -07:00
Jerome Petazzoni	9ffbfacca8	Last words	2016-06-19 11:15:11 -07:00
Jerome Petazzoni	60524d2ff3	Fixes	2016-06-19 00:07:19 -07:00
Jerome Petazzoni	7001c05ec0	DockerCon update	2016-06-18 18:06:15 -07:00
Jonathan Lee	5d4414723d	Upgrade docker-compose files to v2	2016-06-13 21:47:59 -04:00
Jérôme Petazzoni	d31f0980a2	Merge pull request #24 from crd/recommend_slide_changes ... Recommended slide changes 2016-05-29-pycon	2016-06-02 17:10:13 -07:00
Cory Donnelly	6649e97b1e	Update warning to reflect Consul Leader Election bug has been fixed	2016-06-02 15:58:31 -04:00
Cory Donnelly	06b8cbc964	Fix typos	2016-06-02 15:55:02 -04:00