Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ A presentation about cloud-native apps based on Spectacle & ReactJS

Run it local, on CloudFoundry or a Docker container

##Getting Started
##Getting Started (for all deployment methods)

Clone this repository, open a terminal and run `npm install`

Then, to start up the local server, run `npm start`
Optional (to check locally) : Then, to start up the local server, run `npm start`

Open a browser (better be Chrome or Safari) and hit `http://localhost:3000`.
Optional (to cehck locally) : Open a browser (better be Chrome or Safari) and hit `http://localhost:3000`.

## Build & Deploy with Docker

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "EMC-Day-2015",
"name": "EMC-ATR-2015",
"version": "0.0.1",
"description": "EMC xChange Day 2015 (Romania) keynote",
"description": "EMC ATR 2015 (Austria) DevOps Introduction",
"main": "index.html",
"scripts": {
"start": "webpack-dev-server",
Expand Down
28 changes: 17 additions & 11 deletions presentation/deck.jsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/*

Dumitru Taraianu
(aka Mitel)
David Hanacek
(aka sdcloudy)

EMC Core Technologies Division
East & West Africa
EMC
vSpecialist

dumitru.taraianu@emc.com
twitter: @mitelone
david.hanacek@emc.com
twitter: @SD_Cloudy
*/


Expand Down Expand Up @@ -49,11 +49,17 @@ export default class extends React.Component {
<Heading size={1} fit caps textColor="black">
A presentation about this presentation
</Heading>
<Link href="https://github.com/mitel/emcday2015">
<Heading size={1} fit caps textColor="black">
What's DevOps About?
</Heading>
<Heading size={1} fit caps textColor="black">
And why does it matter?
</Heading>
<Link href="https://github.com/sdcloudy/emcdevopsintro">
<Text bold caps textColor="tertiary">Download my code from Github</Text>
</Link>
<Text textSize="1.5em" margin="20px 0px 0px" bold>Right Arrow or swipe To Begin!</Text>
<Text textSize="1.5em" margin="20px 0px 0px" bold>Dumitru Taraianu | EMC Systems Engineer - CTD Emerging Africa | @mitelone</Text>
<Text textSize="1.5em" margin="20px 0px 0px" bold>David Hanacek | EMC vSpecialist | @SD_Cloudy</Text>
</Slide>
<Slide transition={["slide"]} bgColor="black" notes="You can even put notes on your slide. How awesome is that?">
<Image src={images.kat.replace("/", "")} margin="0px auto 40px" height="293px"/>
Expand Down Expand Up @@ -146,7 +152,7 @@ export default class extends React.Component {
</Appear>
<Appear fid="3">
<Text textSize="3.0em" margin="20px 0px 0px" textColor="primary">
Hint: follow the vmware integrated openstack project
Hint: follow the VMware integrated openstack project
</Text>
</Appear>
</Slide>
Expand All @@ -164,7 +170,7 @@ export default class extends React.Component {
</Appear>
<Appear fid="3">
<Heading size={1} caps fit margin="20px 0px 0px" textColor="primary">
..plus any public cloud running on VMWare or OpenStack
..plus any public cloud running on VMware or OpenStack
</Heading>
</Appear>
</Slide>
Expand Down Expand Up @@ -411,7 +417,7 @@ export default class extends React.Component {
Thank you, enjoy the coffee!
</Heading>
<Heading size={1} caps fit lineHeight={1.5} textColor="primary">
@mitelone | github.com/mitel
@SD_Cloudy | github.com/sdcloudy
</Heading>
<Link href="http://www.emcfederation.com"><Image width="100%" src={images.federation}/></Link>
</Slide>
Expand Down
8 changes: 4 additions & 4 deletions runtime/cf/manifest.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
applications:
- name: emc-day-2015
- name: emc-devops-intro
command: node server.js
memory: 512M
memory: 128M
# Add your name/initials to make the hostname unique
# host: emcday-${random-word}
host: emcday
host: emc-devops-intro
# Currently defaults to PWS
domain: cfapps.io
domain: cfapps.io
10 changes: 3 additions & 7 deletions runtime/cf/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
{
"name": "emc-day-2015",
"name": "emc-devops-intro",
"version": "0.0.1",
"author": "mitel",
"author": "sdcloudy",
"dependencies": {
},
"engines": {
"node": "0.12.2",
"npm": "2.7.4"
}
}
}