394 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jérôme Petazzoni	58e76b81f2	Fixing missing stack name 2017-06-12-devopscon	2017-06-12 17:41:55 +02:00
Jérôme Petazzoni	a1adc2292f	Merge pull request #81 from soulshake/devopscon-compose-version ... Fix docker-compose version	2017-06-11 23:01:33 +02:00
AJ Bowen	8d6421ddea	Fix docker-compose version	2017-06-11 23:00:22 +02:00
Jérôme Petazzoni	63b6db4843	First round of updates for devopscon	2017-06-10 21:40:05 +02:00
Jérôme Petazzoni	a84cc36cd8	Update installation method	2017-06-09 18:16:29 +02:00
Jerome Petazzoni	c8ecf5a647	PYCON final check! 2017-05-18-pycon	2017-05-17 18:14:33 -07:00
Jerome Petazzoni	e9ee050386	Explain extra details	2017-05-17 15:56:28 -07:00
Jerome Petazzoni	6e59e2092c	Merge branch 'master' of github.com:jpetazzo/orchestration-workshop	2017-05-17 15:00:42 -07:00
Jerome Petazzoni	c7b0fd32bd	Add detail about ASGs	2017-05-17 15:00:31 -07:00
Jérôme Petazzoni	ead4e33604	Merge pull request #79 from jliu70/oscon2017 ... fix typo	2017-05-17 14:31:26 -07:00
Jérôme Petazzoni	96b4f76c67	Backport all changes from OSCON	2017-05-17 00:17:24 -05:00
Jeff Liu	6337d49123	fix typo	2017-05-08 10:21:51 -05:00
Jerome Petazzoni	aec2de848b	Rename docker-compose files to keep .yml extension (fixes #69) 2017-05-04-goto	2017-05-03 12:44:17 -07:00
Jérôme Petazzoni	91942f22a0	Merge pull request #73 from everett-toews/cd-to-snap ... Change to the snap dir first	2017-05-03 14:36:52 -05:00
Jérôme Petazzoni	93cdc9d987	Merge pull request #72 from everett-toews/fix-worker-service-name ... Fix the dockercoins_worker service name	2017-05-03 14:36:27 -05:00
Jérôme Petazzoni	13e6283221	Merge pull request #71 from everett-toews/netshoot ... Consistent use of the netshoot image	2017-05-03 14:35:54 -05:00
Jerome Petazzoni	e56bea5c16	Update Swarm visualizer information	2017-05-03 12:36:09 -07:00
Jerome Petazzoni	eda499f084	Fix link to Raft (thanks @kchien) - fixes #74	2017-05-03 12:20:45 -07:00
Jerome Petazzoni	ae638b8e89	Minor updates before GOTO	2017-05-03 11:46:35 -07:00
Jerome Petazzoni	5296be32ed	Handle untagged resources	2017-05-03 11:26:47 -07:00
Jerome Petazzoni	f1cd3ba7d0	Remove rc.yaml	2017-05-03 10:02:36 -07:00
Jérôme Petazzoni	b307adee91	Last updates ... Conflicts: docs/index.html	2017-05-03 09:34:42 -07:00
Jérôme Petazzoni	f4540fad78	Update describe-instances for awscli 1.11 (thanks @mikegcoleman for finding that bug!)	2017-05-03 09:15:45 -07:00
Jérôme Petazzoni	70db794111	Simplify stackfiles	2017-04-16 23:56:30 -05:00
Jérôme Petazzoni	abafc0c8ec	Add swarm-rafttool	2017-04-16 23:47:56 -05:00
Everett Toews	a7dba759a8	Change to the snap dir first	2017-04-16 14:34:49 -05:00
Everett Toews	b14662490a	Fix the dockercoins_worker service name	2017-04-16 13:23:54 -05:00
Everett Toews	9d45168752	Consistent use of the netshoot image	2017-04-16 13:16:02 -05:00
Jérôme Petazzoni	7b3c9cd2c3	Add @alexmavr/swarm-nbt (FTW!)	2017-04-15 18:29:32 -05:00
Jérôme Petazzoni	84d4a367ec	Mention --filter for docker service ps	2017-04-15 17:45:24 -05:00
Jérôme Petazzoni	bd6b37b573	Add @manomarks' Swarm viz tool	2017-04-15 17:21:38 -05:00
Jérôme Petazzoni	e1b2a4440d	Update docker service logs; --detach=false	2017-04-14 15:39:52 -05:00
Jérôme Petazzoni	1b5365d905	Update settings; add security workshop	2017-04-14 15:39:24 -05:00
Jérôme Petazzoni	27ea268026	Automatically resolve AMI ID to use	2017-04-14 15:32:03 -05:00
Jérôme Petazzoni	b0f566538d	Re-add useful self-paced slides	2017-03-31 21:49:57 -05:00
Jerome Petazzoni	e637354d3e	Fix TOC and minor tweaks	2017-03-31 21:41:24 -05:00
Jerome Petazzoni	1f8c27b1aa	Update deployed versions	2017-03-31 21:40:05 -05:00
Jerome Petazzoni	f7d317d960	Backporting Devoxx updates	2017-03-31 21:39:48 -05:00
Jérôme Petazzoni	a8c54a8afd	Update chat links	2017-03-31 21:36:08 -05:00
Jerome Petazzoni	73b3752c7e	Change chat links	2017-03-31 21:33:12 -05:00
Jérôme Petazzoni	d60ba2e91e	Merge pull request #68 from hknust/master ... Service name should be dockercoins_worker not worker	2017-03-30 17:11:37 -05:00
Jérôme Petazzoni	d480f5c26a	Clarify node switching commands	2017-03-20 19:30:38 -07:00
Jérôme Petazzoni	540aa91f48	Hotfix JS file	2017-03-10 16:46:51 -06:00
Jérôme Petazzoni	8f3c0da385	Use our custom fork of remark; updates for Docker Birthday	2017-03-10 16:40:48 -06:00
Holger Knust	6610ff178d	Fixed typo on slide. Attempts instead of attemps	2017-03-04 23:13:35 -08:00
Holger Knust	9a9e725d5b	Service name should be dockercoins_worker not worker	2017-03-04 11:29:01 -08:00
Jérôme Petazzoni	09cabc556e	Update for SCALE 15x 2017-03-03-scale	2017-03-02 16:38:59 -08:00
Jérôme Petazzoni	44f4017992	Switch from localhost to 127.0.0.1 (to work around some weird DNS issues)	2017-03-02 14:06:59 -08:00
Jérôme Petazzoni	6f85ff7824	Reorganize advanced content for Docker Birthday	2017-02-16 15:16:06 -06:00
Jérôme Petazzoni	514ac69a8f	Ship part 1 for Docker Birthday	2017-02-15 00:03:01 -06:00