249 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jerome Petazzoni	86271b6336	Merge branch 'master' of github.com:jpetazzo/orchestration-workshop 2016-02-15-zenika	2016-02-14 07:11:13 -08:00
Jerome Petazzoni	104e736c45	Add kibana screenshot	2016-02-14 07:10:52 -08:00
Jerome Petazzoni	9dfb421eb1	Last round of updates	2016-02-14 07:10:42 -08:00
Jerome Petazzoni	d69719abc6	Content rehaul before Paris workshop	2016-02-14 06:05:39 -08:00
Jérôme Petazzoni	98bac6713d	Add v2 Compose file	2016-02-14 13:19:10 +00:00
Jerome Petazzoni	6c1958e244	Update Compose+Swarm section	2016-02-13 10:56:55 -08:00
Jerome Petazzoni	936a80f86d	Conclusions + mention Docker Cloud and UCP	2016-02-13 10:23:10 -08:00
Jerome Petazzoni	2634230a4a	Switch to node:4 image to work around AUFS issue	2016-02-12 09:11:00 -08:00
Jerome Petazzoni	4e96a2949c	Add Swarm replication and rescheduling sections	2016-02-12 09:10:39 -08:00
Jerome Petazzoni	175d468718	Merge branch 'master' of github.com:jpetazzo/orchestration-workshop	2016-02-09 16:33:25 -08:00
Jerome Petazzoni	eb38b7e2e6	Rehaul logging section	2016-02-09 16:33:16 -08:00
Jérôme Petazzoni	9d5dfc9a40	Add sample Compose file with GELF logging	2016-02-10 00:32:00 +00:00
Jérôme Petazzoni	676aad7edc	Revert to Compose v1 for simplicity	2016-02-09 23:39:30 +00:00
Jérôme Petazzoni	43d574a164	Add Compose file for ELK stack	2016-02-09 22:09:48 +00:00
Jerome Petazzoni	661948d162	Update versions, schedule, and twitter button	2016-02-08 07:24:50 -08:00
Jerome Petazzoni	edf3aeb9c4	Fix LISA reference 2016-01-22-scale	2016-01-26 10:34:07 -08:00
Jerome Petazzoni	e16c391deb	Good to go!	2016-01-22 14:29:37 -08:00
Jérôme Petazzoni	1a486a2f95	Minor fixes	2016-01-21 18:06:30 -08:00
Jerome Petazzoni	962737ffa2	Update for SCALE; add support for multi-host networking	2016-01-21 16:44:34 -08:00
Jérôme Petazzoni	076d471a1d	Add LICENSE (closes #5) 2015-11-10-lisa	2015-12-26 20:22:46 +01:00
Jerome Petazzoni	ee2f8ef02e	Fixes after LISA	2015-11-29 14:13:52 -08:00
Jerome Petazzoni	bc40a77b2b	Update deployment script for Docker Machine	2015-11-23 08:44:13 -08:00
Jerome Petazzoni	f532c99c68	Merge branch 'master' of github.com:jpetazzo/orchestration-workshop	2015-11-10 04:01:00 -08:00
Jerome Petazzoni	9cb8e60e26	Changes for LISA	2015-11-10 04:00:54 -08:00
Jérôme Petazzoni	49d25f19da	Merge pull request #4 from clkao/master ... Stop docker from complaining about ambiguous volume mapping	2015-10-15 08:41:46 -07:00
Chia-liang Kao	1c170bedb7	Stop docker from complaining about ambiguous volume mapping	2015-10-15 13:31:52 +08:00
Jerome Petazzoni	33d29248bb	Allow to use COMPOSE_FILE env var in scripts	2015-10-05 08:50:48 -07:00
Jerome Petazzoni	ecc5a3eafe	Fix permissions	2015-10-04 20:33:17 -07:00
Jerome Petazzoni	65c96296cb	Add YAML fixup helper	2015-10-04 19:50:15 -07:00
Jerome Petazzoni	49c17df2fd	Change YAML output to work around go-gypsy	2015-10-04 13:36:42 -07:00
Jerome Petazzoni	10b3a9c4e0	Style labels	2015-10-03 16:13:42 -07:00
Jerome Petazzoni	eb864d6719	Fix typos and add some extra content	2015-09-28 11:01:07 -07:00
Jerome Petazzoni	b2fc2827f2	Big update for LISA	2015-09-27 22:10:32 -07:00
Jerome Petazzoni	8e5af7b964	Add slides URL to printed cards	2015-09-27 12:58:13 -07:00
Jerome Petazzoni	3c9d0dfc2c	Reshuffle performance analysis for 2 hours workshops + flesh out Swarm 2015-09-24-strangeloop	2015-09-24 12:07:23 -07:00
Jérôme Petazzoni	72708514ec	Merge pull request #2 from soulshake/master ... those -. these; add note for clarification about running all commands…	2015-09-24 10:15:15 -07:00
soulshake	f5e9b82443	those -. these; add note for clarification about running all commands from node1	2015-09-24 12:05:52 -05:00
Jerome Petazzoni	dc85733460	Merge branch 'master' of github.com:jpetazzo/orchestration-workshop	2015-09-24 16:51:16 +00:00
Jerome Petazzoni	55ad3f2733	Update to new ambassador code	2015-09-24 16:51:04 +00:00
Jerome Petazzoni	d9829f55ea	Fix typo	2015-09-24 16:49:26 +00:00
Jerome Petazzoni	597b237271	Update Swarm placement constraints	2015-09-24 09:10:42 -07:00
Jerome Petazzoni	676bbd02fe	Allow to pass only one file name to unlink-services	2015-09-23 20:06:07 -07:00
Jerome Petazzoni	8c3ef01dd3	Update volume path	2015-09-21 22:28:48 -07:00
Jerome Petazzoni	7573b3b4b4	Update Swarm install instructions to use Machine	2015-09-21 22:28:31 -07:00
Jerome Petazzoni	082f507822	Update versions and add Docker Machine	2015-09-21 19:19:42 -07:00
Jerome Petazzoni	c3b9483c7b	Parallel push + use DOCKER_COMPOSE_YML env var	2015-09-21 12:07:11 -07:00
Jerome Petazzoni	1556901854	Updated README yay	2015-08-13 14:59:27 -07:00
Jerome Petazzoni	420481ada1	fix typo	2015-07-22 14:33:45 -07:00
Jerome Petazzoni	e637bfdf2d	log output	2015-07-21 08:06:39 -07:00
Jerome Petazzoni	aad1458344	update slides for OSCON tutorial	2015-07-21 08:06:23 -07:00