Skip to content

Commit

Permalink
Merge pull request #33 from CiscoCloud/documentation
Browse files Browse the repository at this point in the history
update lab files
  • Loading branch information
kmontres committed Jan 28, 2016
2 parents 1039fd1 + 2d36b2e commit 4afc30e
Show file tree
Hide file tree
Showing 54 changed files with 395 additions and 49 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@
"byod": true,
"slug": "Bootstrap a project in Shipped",
"files": [
{"title": "1.md"},
{"title": "2.md"}
{"title": "1-shipped-bootstrap-project.md"},
],
"tags": [
{"title": "Shipped"},
{"title": "Cloud"},
{"title": "Project"},
{"title": "Windows"}
{"title": "golang"}
],
"related": [
{
Expand All @@ -32,7 +31,7 @@
},
{
"labId": "shipped-manage-services",
"title": "Shipped - Maanging Services"
"title": "Shipped - Managing Services"
},
{
"labId": "shipped-manage-environments",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ You will learn how to:

## Prerequisites

- Managing Services
- *Managing Services*



Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@
"byod": true,
"slug": "Bootstrap a project in Shipped",
"files": [
{"title": "1.md"},
{"title": "2.md"}
{"title": "1-shipped-bootstrap-spark.md"}
],
"tags": [
{"title": "Shipped"},
{"title": "Cloud"},
{"title": "Project"},
{"title": "Windows"},
{"title": "golang"},
{"title": "Spark"}
],
"related": [
Expand All @@ -33,7 +32,7 @@
},
{
"labId": "shipped-manage-services",
"title": "Shipped - Maanging Services"
"title": "Shipped - Managing Services"
},
{
"labId": "shipped-manage-environments",
Expand Down
7 changes: 3 additions & 4 deletions shipped-deploy-project/src/posts/shipped-deploy-project.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@
"byod": true,
"slug": "Deploy a project in Shipped",
"files": [
{"title": "1.md"},
{"title": "2.md"}
{"title": "1-shipped-deploy-project.md"}
],
"tags": [
{"title": "Shipped"},
{"title": "Cloud"},
{"title": "Project"},
{"title": "Windows"}
{"title": "golang"}
],
"related": [
{
Expand All @@ -32,7 +31,7 @@
},
{
"labId": "shipped-manage-services",
"title": "Shipped - Maanging Services"
"title": "Shipped - Managing Services"
},
{
"labId": "shipped-manage-environments",
Expand Down
2 changes: 1 addition & 1 deletion shipped-first-time/src/posts/files/shipped-first-time/1.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,5 @@ Specific actions for each of these methods is described in the related Learning

## Next

Go to **Shipped - Managing Projects** to create a new project.
Go to [**Shipped - Managing Projects**](http://ciscocloud.github.io/shipped/dist/#) to create a new project.

13 changes: 8 additions & 5 deletions shipped-first-time/src/posts/shipped-first-time.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,24 @@
"byod": true,
"slug": "Get set up in Shipped",
"files": [
{"title": "1.md"},
{"title": "2.md"}
{"title": "1-first-time.md"}
],
"tags": [
{"title": "Shipped"},
{"title": "Cloud"},
{"title": "Project"},
{"title": "Windows"}
{"title": "Golang"}
],
"related": [
{
"labId": "shipped-first-time",
"title": "Shipped - Using Shipped the First Time"
},
{
{
"labId": "shipped-quick-start",
"title": "Shipped - Quick Start"
},
{
"labId": "shipped-manage-projects",
"title": "Shipped - Managing Projects"
},
Expand All @@ -32,7 +35,7 @@
},
{
"labId": "shipped-manage-services",
"title": "Shipped - Maanging Services"
"title": "Shipped - Managing Services"
},
{
"labId": "shipped-manage-environments",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ Deleting an environment is permanent and can't be undone.
The environment is removed from your project.




## Delete an Environment using the API
This feature has not been implemented.



Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@
"byod": true,
"slug": "Manage Environments in Shipped",
"files": [
{"title": "1.md"},
{"title": "2.md"}
{"title": "1-shipped-manage-environments.md"},
{"title": "2-shipped-manage-environments.md"},
{"title": "3-shipped-manage-environments.md"},
{"title": "4-shipped-manage-environments.md"}
],
"tags": [
{"title": "Shipped"},
{"title": "Cloud"},
{"title": "Project"},
{"title": "Windows"}
{"title": "golang"}
],
"related": [
{
Expand All @@ -32,7 +34,7 @@
},
{
"labId": "shipped-manage-services",
"title": "Shipped - Maanging Services"
"title": "Shipped - Managing Services"
},
{
"labId": "shipped-manage-environments",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ You will learn how to:

##Prerequisites

- Using Shipped the First Time
- *Using Shipped the First Time*


##References
Expand Down
10 changes: 6 additions & 4 deletions shipped-manage-projects/src/posts/shipped-manage-projects.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@
"byod": true,
"slug": "Manage Projects in Shipped",
"files": [
{"title": "1.md"},
{"title": "2.md"}
{"title": "1-shipped-manage-projects.md"},
{"title": "2-shipped-manage-projects.md"},
{"title": "3-shipped-manage-projects.md"},
{"title": "4-shipped-manage-projects.md"}
],
"tags": [
{"title": "Shipped"},
{"title": "Cloud"},
{"title": "Project"},
{"title": "Windows"}
{"title": "golang"}
],
"related": [
{
Expand All @@ -32,7 +34,7 @@
},
{
"labId": "shipped-manage-services",
"title": "Shipped - Maanging Services"
"title": "Shipped - Managing Services"
},
{
"labId": "shipped-manage-environments",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Shipped automatically checks to see if the service is ready. If ready, a success

## Check the Service using the API

There are no API commands to check the service.
This feature has not been implemented.



Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ If your service needs repair, instructions automatically appear on the page. Sim

## Repair the Service using the API

There are no API commands to repair a service.
This feature has not been implemented.



Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ Deleting a service is permanent and can't be undone.
<img src="assets/pr-del.png">
![](posts/files/shipped-manage-services/assets/pr-del.png)

The service is now removed..

The service is now removed.



Expand Down
12 changes: 8 additions & 4 deletions shipped-manage-services/src/posts/shipped-manage-services.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,18 @@
"byod": true,
"slug": "Manage Services in Shipped",
"files": [
{"title": "1.md"},
{"title": "2.md"}
{"title": "1-shipped-manage-services.md"},
{"title": "2-shipped-manage-services.md"},
{"title": "3-shipped-manage-services.md"},
{"title": "4-shipped-manage-services.md"},
{"title": "5-shipped-manage-services.md"},
{"title": "6-shipped-manage-services.md"}
],
"tags": [
{"title": "Shipped"},
{"title": "Cloud"},
{"title": "Project"},
{"title": "Windows"}
{"title": "golang"}
],
"related": [
{
Expand All @@ -32,7 +36,7 @@
},
{
"labId": "shipped-manage-services",
"title": "Shipped - Maanging Services"
"title": "Shipped - Managing Services"
},
{
"labId": "shipped-manage-environments",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ HTTP Request:

## Add a User using the CLI

This feature has not yet been implemented.
This feature has not been implemented.



Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@

You can permanently delete a user at any time. Users can't be modified, but they can be deleted and added again.

You can delete a user using the:

1. <a href="#ui"> UI</a>
2. <a href="#api"> API</a>
3. <a href="#cli"> CLI</a>



<a name="ui"></a>
Expand Down
9 changes: 5 additions & 4 deletions shipped-manage-users/src/posts/shipped-manage-users.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@
"byod": true,
"slug": "Manage Users in Shipped",
"files": [
{"title": "1.md"},
{"title": "2.md"}
{"title": "1-shipped-manage-users.md"},
{"title": "2-shipped-manage-users.md"},
{"title": "3-shipped-manage-users.md"}
],
"tags": [
{"title": "Shipped"},
{"title": "Cloud"},
{"title": "Project"},
{"title": "Windows"}
{"title": "golang"}
],
"related": [
{
Expand All @@ -32,7 +33,7 @@
},
{
"labId": "shipped-manage-services",
"title": "Shipped - Maanging Services"
"title": "Shipped - Managing Services"
},
{
"labId": "shipped-manage-environments",
Expand Down
Binary file not shown.
54 changes: 54 additions & 0 deletions shipped-quick-start/src/posts/files/shipped-quick-start/1.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
## Step 1. Sign into Shipped / Create an account on GitHub


1. In the browser navigate to <a href="https://github.com/" target="_blank">GitHub</a>
* If you have not yet created a Userid Click "Register" and follow the instructions.

2. In the browser navigate to <a href="http://ciscocloud.github.io/shipped/dist/#" target="_blank">Shipped</a>
* Once you have registering with GitHub, you can use your userid to log in to Shipped.


![](https://github.com/CiscoCloud/shipped-user-guide/blob/master/build/images/walkthroughs/welcome.png)

# Step 2. Create your first project with Shipped


## Start Composing

Ensure you have navigated to http://ciscocloud.github.io/shipped/dist/#, that you are signed in.

Select "Create New Project" to begin.

![](https://github.com/CiscoCloud/shipped-user-guide/blob/master/build/images/walkthroughs/create_project.png)

Enter the name of your new project name and select "Start Composing". For this example I am going to choice "MyFirstShippedProject".

### Development Frameworks###

It allows us to quickly create projects from pre-defined development frameworks including

* Ruby on Rails
* GruntJS
* Python
* Golang
* Dropwizard
* ExpressJS
* ASP.Net MVC
* PHP

I am going to choose Golang for my project.
![](https://github.com/CiscoCloud/shipped-user-guide/blob/master/build/images/walkthroughs/compose_develop_tab.png)

## Choose a Repository
Enter a name for the repository for the Docker image that will be created as a part of this project. I am going to choose shipped101helloworld. As I have a free account on GitHub, my only choice is to choose "Public". I will then click "Add Services" to continue; Today I only want to add one microservice so I will continue by choosing "Next Step"

![](https://github.com/CiscoCloud/Shipped-Learning-Labs/blob/master/shipped-101-first-project/src/posts/files/shipped-101-first-project/addmicroservice_withname.png)

## Add Dependancies
We are also prompted to add dependencies such as Cisco APIs, Datastores, Message Queues, etc. Today will choose to keep it simple and not add any dependencies and we will select

## Build Project
Choose "Build Project"
![](https://github.com/CiscoCloud/shipped-user-guide/blob/master/build/images/walkthroughs/build_project.png)

### You have now created your first project with Shipped. Next, you will 'git' your project to your local machine, make some changes, and push it back to Shipped and GitHub
Loading

0 comments on commit 4afc30e

Please sign in to comment.