Skip to content

Commit

Permalink
Merge release branch into master [skip ci]
Browse files Browse the repository at this point in the history
  • Loading branch information
tinnightcap committed Jun 24, 2017
2 parents abda6d2 + e7583cb commit 7e636ee
Show file tree
Hide file tree
Showing 10 changed files with 3,318 additions and 32 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ nubis/builder/artifacts/*-dev*
nubis/terraform/terraform.tfstate*
nubis/terraform/.terraform
nubis/terraform/terraform.tfvars
nubis/builder/artifacts/*-dev/
nubis/builder/artifacts/AMIs.json
12 changes: 11 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,24 @@
# Change Log

## [v1.4.2](https://github.com/nubisproject/nubis-skel/tree/v1.4.2) (2017-05-03)
## [v1.5.0](https://github.com/nubisproject/nubis-skel/tree/v1.5.0) (2017-06-24)
[Full Changelog](https://github.com/nubisproject/nubis-skel/compare/v1.4.2...v1.5.0)

**Merged pull requests:**

- Update terraform modules to current release [\#101](https://github.com/nubisproject/nubis-skel/pull/101) ([tinnightcap](https://github.com/tinnightcap))

## [v1.4.2](https://github.com/nubisproject/nubis-skel/tree/v1.4.2) (2017-05-04)
[Full Changelog](https://github.com/nubisproject/nubis-skel/compare/v1.4.1...v1.4.2)

**Closed issues:**

- Tag v1.4.2 release [\#97](https://github.com/nubisproject/nubis-skel/issues/97)
- Tag v1.4.2 release [\#94](https://github.com/nubisproject/nubis-skel/issues/94)

**Merged pull requests:**

- Merge v1.4.2 release into develop. \[skip ci\] [\#100](https://github.com/nubisproject/nubis-skel/pull/100) ([tinnightcap](https://github.com/tinnightcap))
- Update CHANGELOG for v1.4.2 release \[skip ci\] [\#99](https://github.com/nubisproject/nubis-skel/pull/99) ([tinnightcap](https://github.com/tinnightcap))
- Update CHANGELOG for v1.4.2 release \[skip ci\] [\#95](https://github.com/nubisproject/nubis-skel/pull/95) ([tinnightcap](https://github.com/tinnightcap))

## [v1.4.1](https://github.com/nubisproject/nubis-skel/tree/v1.4.1) (2017-04-11)
Expand Down
38 changes: 31 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,45 +1,69 @@
# nubis-skel


# nubis-skel

[![Version](https://img.shields.io/github/release/nubisproject/nubis-skel.svg?maxAge=2592000)](https://github.com/nubisproject/nubis-skel/releases)
[![Build Status](https://img.shields.io/travis/nubisproject/nubis-skel/master.svg?maxAge=2592000)](https://travis-ci.org/nubisproject/nubis-skel)
[![Issues](https://img.shields.io/github/issues/nubisproject/nubis-skel.svg?maxAge=2592000)](https://github.com/nubisproject/nubis-skel/issues)

This is a skeleton repository that can be used for testing or as a quick way for you to incorporate nubis into your own project.
This is a skeleton repository that can be used for testing or as a quick way for
you to incorporate nubis into your own project.

## Prerequisites

If you are new to the Nubisproject you will need to set up some [prerequisites](https://github.com/Nubisproject/nubis-docs/blob/master/PREREQUISITES.md).

## Get the code
Next grab the latest [release](https://github.com/Nubisproject/nubis-skel/releases), extract it and copy the *nubis* directory into your code base.

Next grab the latest [release](https://github.com/Nubisproject/nubis-skel/releases),
extract it and copy the *nubis* directory into your code base.

## Build the project
This step is only necessary if you have changes, otherwise you can simply configure the deployment using an ami id from the following list:

This step is only necessary if you have changes, otherwise you can simply
configure the deployment using an ami id from the following list:

| Region | Ubuntu | Amazon Linux |
|-----------|--------------|--------------|
| us-east-1 | ami-e4eaa584 | ami-987e078f |
| us-west-2 | ami-e963be89 | ami-2563be45 |

If you run *nubis-builder* it will output an ami id for you to use.

```bash

nubis-builder build

```

## Configure the deployment
Create a nubis/terraform/terraform.tfvars file by copying the [terraform.tfvars-dist](nubis/terraform/terraform.tfvars) file and editing the parameter values. More detailed instructions can be found [here](nubis/terraform/README.md#set-up).

Create a nubis/terraform/terraform.tfvars file by copying the
[terraform.tfvars-dist](nubis/terraform/terraform.tfvars) file and editing the
parameter values. More detailed instructions can be found [here](nubis/terraform/README.md#set-up).

```bash

cp nubis/terraform/terraform.tfvars-dist nubis/terraform/terraform.tfvars
vi nubis/terraform/terraform.tfvars

```

## Deploy the application
You are now ready to deploy your application. Be sure to replace "\<username\>" with a unique application name. You can find more detailed instructions [here](nubis/terraform/README.md#commands-to-work-with-terraform).

You are now ready to deploy your application. Be sure to replace "\<username\>"
with a unique application name. You can find more detailed instructions [here](nubis/terraform/README.md#commands-to-work-with-terraform).

```bash

$> cd nubis/terraform
$> terraform get -update=true
$> terraform plan
$> terraform apply

```

## Help
If you run into any issues, feel free to reach out to us. We hang out in #nubis-users on irc.mozilla.org.

If you run into any issues, feel free to reach out to us. We hang out
in #nubis-users on irc.mozilla.org.
18 changes: 9 additions & 9 deletions nubis/builder/artifacts/AMIs.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{
"builds": [
{
"name": "amazon-ebs-amazon-linux",
"name": "amazon-ebs-ubuntu",
"builder_type": "amazon-ebs",
"build_time": 1493911298,
"build_time": 1498334653,
"files": null,
"artifact_id": "ap-northeast-1:ami-e17c4d86,ap-northeast-2:ami-ffa07d91,ap-southeast-1:ami-5d23993e,ap-southeast-2:ami-3eccc75d,eu-central-1:ami-8127f8ee,eu-west-1:ami-858b86e3,sa-east-1:ami-91b6dafd,us-east-1:ami-51c9a647,us-west-1:ami-3e66405e,us-west-2:ami-e6e47f86",
"packer_run_uuid": "60871768-2578-c18e-6531-d00211a6532a"
"artifact_id": "ap-northeast-1:ami-a8aeb9cf,ap-northeast-2:ami-2413cc4a,ap-southeast-1:ami-ed7af58e,ap-southeast-2:ami-c88c9cab,eu-central-1:ami-bc9234d3,eu-west-1:ami-956872f3,sa-east-1:ami-5f2d4733,us-east-1:ami-d6ba8fc0,us-west-1:ami-32476b52,us-west-2:ami-59a5b120",
"packer_run_uuid": "19d0192c-6bec-5c40-6876-649314b9d9c0"
},
{
"name": "amazon-ebs-ubuntu",
"name": "amazon-ebs-amazon-linux",
"builder_type": "amazon-ebs",
"build_time": 1493911490,
"build_time": 1498334953,
"files": null,
"artifact_id": "ap-northeast-1:ami-6979480e,ap-northeast-2:ami-34a67b5a,ap-southeast-1:ami-2b279d48,ap-southeast-2:ami-fcc3c89f,eu-central-1:ami-8027f8ef,eu-west-1:ami-b48b86d2,sa-east-1:ami-82b5d9ee,us-east-1:ami-13c7a805,us-west-1:ami-2598bf45,us-west-2:ami-16980376",
"packer_run_uuid": "60871768-2578-c18e-6531-d00211a6532a"
"artifact_id": "ap-northeast-1:ami-9cabbcfb,ap-northeast-2:ami-3b13cc55,ap-southeast-1:ami-c278f7a1,ap-southeast-2:ami-0a8e9e69,eu-central-1:ami-37933558,eu-west-1:ami-48746e2e,sa-east-1:ami-ae2c46c2,us-east-1:ami-f1b88de7,us-west-1:ami-b1476bd1,us-west-2:ami-33a6b24a",
"packer_run_uuid": "19d0192c-6bec-5c40-6876-649314b9d9c0"
}
],
"last_run_uuid": "60871768-2578-c18e-6531-d00211a6532a"
"last_run_uuid": "19d0192c-6bec-5c40-6876-649314b9d9c0"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"builds": [
{
"name": "amazon-ebs-ubuntu",
"builder_type": "amazon-ebs",
"build_time": 1498334653,
"files": null,
"artifact_id": "ap-northeast-1:ami-a8aeb9cf,ap-northeast-2:ami-2413cc4a,ap-southeast-1:ami-ed7af58e,ap-southeast-2:ami-c88c9cab,eu-central-1:ami-bc9234d3,eu-west-1:ami-956872f3,sa-east-1:ami-5f2d4733,us-east-1:ami-d6ba8fc0,us-west-1:ami-32476b52,us-west-2:ami-59a5b120",
"packer_run_uuid": "19d0192c-6bec-5c40-6876-649314b9d9c0"
},
{
"name": "amazon-ebs-amazon-linux",
"builder_type": "amazon-ebs",
"build_time": 1498334953,
"files": null,
"artifact_id": "ap-northeast-1:ami-9cabbcfb,ap-northeast-2:ami-3b13cc55,ap-southeast-1:ami-c278f7a1,ap-southeast-2:ami-0a8e9e69,eu-central-1:ami-37933558,eu-west-1:ami-48746e2e,sa-east-1:ami-ae2c46c2,us-east-1:ami-f1b88de7,us-west-1:ami-b1476bd1,us-west-2:ami-33a6b24a",
"packer_run_uuid": "19d0192c-6bec-5c40-6876-649314b9d9c0"
}
],
"last_run_uuid": "19d0192c-6bec-5c40-6876-649314b9d9c0"
}
Loading

0 comments on commit 7e636ee

Please sign in to comment.