Support Custom Domain

.gitignore

@@ -31,5 +31,6 @@ gin-bin
 # iruka artifacts
 #
 artifacts
-iruka
+iruka/iruka
+irukad/irukad
 iruka.yml

agent/agent.go

@@ -3,13 +3,15 @@ package agent
 import (
 	"fmt"
 	"os"
+	"strconv"
 	"strings"
 	"time"
 
 	"code.google.com/p/go-uuid/uuid"
 	"github.com/fsouza/go-dockerclient"
 
 	"github.com/spesnova/iruka/registry"
+	"github.com/spesnova/iruka/router"
 	"github.com/spesnova/iruka/schema"
 )
 
@@ -25,10 +27,11 @@ type Agent interface {
 type IrukaAgent struct {
 	docker  *docker.Client
 	reg     *registry.Registry
+	rou     *router.Router
 	Machine string
 }
 
-func NewAgent(host, machine string, reg *registry.Registry) Agent {
+func NewAgent(host, machine string, reg *registry.Registry, rou *router.Router) Agent {
 	if os.Getenv("IRUKA_DOCKER_HOST") != "" {
 		host = os.Getenv("IRUKA_DOCKER_HOST")
 	}
@@ -44,6 +47,7 @@ func NewAgent(host, machine string, reg *registry.Registry) Agent {
 	return &IrukaAgent{
 		docker:  client,
 		reg:     reg,
+		rou:     rou,
 		Machine: machine,
 	}
 }
@@ -61,7 +65,11 @@ func (a *IrukaAgent) Pulse() {
 			// Regist only containers that managed by iruka
 			s := strings.Split(name, ".")
 			if uuid.Parse((s[len(s)-1])) == nil {
-				fmt.Println("Skipped to register:", name)
+				// Vulcand is always running with iruka
+				if name != "irukad" && name != "vulcand" {
+					fmt.Println("Skipped to register:", name)
+				}
+
 				continue
 			}
 
@@ -76,9 +84,23 @@ func (a *IrukaAgent) Pulse() {
 				PublishedPort: container.Ports[0].PublicPort,
 			}
 
-			_, err := a.reg.UpdateContainerState(name, opts)
+			c, err := a.reg.UpdateContainerState(name, opts)
 			if err != nil {
 				fmt.Println(err.Error())
+				continue
+			}
+
+			url := "http://" + c.Machine + ":" + strconv.FormatInt(c.PublishedPort, 10)
+
+			if !a.rou.IsServerExists(c.AppID.String(), name) {
+				err = a.rou.AddServer(c.AppID.String(), name, url)
+
+				if err != nil {
+					fmt.Println(err.Error())
+					continue
+				}
+
+				fmt.Printf("Registered new container to %s: %s\n", c.AppID.String(), name)
 			}
 		}
 

client/domain.go

@@ -0,0 +1,19 @@
+package iruka
+
+import (
+	"github.com/spesnova/iruka/schema"
+)
+
+func (c *Client) DomainCreate(appIdentity string, opts schema.DomainCreateOpts) (schema.Domain, error) {
+	var domainRes schema.Domain
+	return domainRes, c.Post(&domainRes, "/apps/"+appIdentity+"/domains", opts)
+}
+
+func (c *Client) DomainDelete(appIdentity, domainIdentity string) error {
+	return c.Delete("/apps/" + appIdentity + "/domains/" + domainIdentity)
+}
+
+func (c *Client) DomainList(appIdentity string) ([]schema.Domain, error) {
+	var domainsRes []schema.Domain
+	return domainsRes, c.Get(&domainsRes, "/apps/"+appIdentity+"/domains")
+}

coreos/user-data.yml.erb

@@ -41,6 +41,26 @@ coreos:
 
         [Install]
         WantedBy=sockets.target
+    - name: vulcand.service
+      command: start
+      enable: true
+      content: |
+        [Unit]
+        Description=Vulcand
+        After=docker.service
+        Requires=docker.service
+
+        [Service]
+        TimeoutStartSec=0
+        User=core
+        ExecStartPre=-/usr/bin/docker kill vulcand
+        ExecStartPre=-/usr/bin/docker rm vulcand
+        ExecStartPre=/usr/bin/docker pull mailgun/vulcand:v0.8.0-beta.2
+        ExecStart=/usr/bin/docker run --name vulcand -p 80:80 -p 443:443 -p 8182:8182 -p 8181:8181 mailgun/vulcand:v0.8.0-beta.2 /go/bin/vulcand -apiInterface=0.0.0.0 -interface=0.0.0.0 -etcd=http://10.1.42.1:4001 -port=80 -apiPort=8182
+        ExecStop=/usr/bin/docker stop vulcand
+
+        [Install]
+        WantedBy=multi-user.target
 write_files:
   - path: /etc/ssh/sshd_config
     permissions: 0600

docs/api-v1-alpha.md

@@ -565,4 +565,156 @@ HTTP/1.1 200 OK
 ```
 
 
+## Domain
+
+Domain attached to an app on iruka.
+
+### Attributes
+
+| Name | Type | Description | Example |
+| ------- | ------- | ------- | ------- |
+| **created_at** | *date-time* | when domain was created | `"2012-01-01T12:00:00Z"` |
+| **id** | *uuid* | unique identifier of domain | `"01234567-89ab-cdef-0123-456789abcdef"` |
+| **hostname** | *string* | domain hostname | `"example.com"` |
+| **updated_at** | *date-time* | when domain was updated | `"2012-01-01T12:00:00Z"` |
+
+### Domain Create
+
+Create a new domain.
+
+```
+POST /apps/{app_id_or_name}/domains
+```
+
+#### Optional Parameters
+
+| Name | Type | Description | Example |
+| ------- | ------- | ------- | ------- |
+| **hostname** | *string* | domain hostname | `"example.com"` |
+
+
+#### Curl Example
+
+```bash
+$ curl -n -X POST https://<your-iruka-server>.com/api/v1-alpha/apps/$APP_ID_OR_NAME/domains \
+  -H "Content-Type: application/json" \
+ \
+  -d '{
+  "hostname": "example.com"
+}'
+```
+
+
+#### Response Example
+
+```
+HTTP/1.1 201 Created
+```
+
+```json
+{
+  "created_at": "2012-01-01T12:00:00Z",
+  "id": "01234567-89ab-cdef-0123-456789abcdef",
+  "hostname": "example.com",
+  "updated_at": "2012-01-01T12:00:00Z"
+}
+```
+
+### Domain Delete
+
+Delete an existing domain.
+
+```
+DELETE /apps/{app_id_or_name}/domains/{domain_id_or_hostname}
+```
+
+
+#### Curl Example
+
+```bash
+$ curl -n -X DELETE https://<your-iruka-server>.com/api/v1-alpha/apps/$APP_ID_OR_NAME/domains/$DOMAIN_ID_OR_HOSTNAME \
+  -H "Content-Type: application/json" \
+```
+
+
+#### Response Example
+
+```
+HTTP/1.1 200 OK
+```
+
+```json
+{
+  "created_at": "2012-01-01T12:00:00Z",
+  "id": "01234567-89ab-cdef-0123-456789abcdef",
+  "hostname": "example.com",
+  "updated_at": "2012-01-01T12:00:00Z"
+}
+```
+
+### Domain Info
+
+Info for existing domain.
+
+```
+GET /apps/{app_id_or_name}/domains/{domain_id_or_hostname}
+```
+
+
+#### Curl Example
+
+```bash
+$ curl -n https://<your-iruka-server>.com/api/v1-alpha/apps/$APP_ID_OR_NAME/domains/$DOMAIN_ID_OR_HOSTNAME
+```
+
+
+#### Response Example
+
+```
+HTTP/1.1 200 OK
+```
+
+```json
+{
+  "created_at": "2012-01-01T12:00:00Z",
+  "id": "01234567-89ab-cdef-0123-456789abcdef",
+  "hostname": "example.com",
+  "updated_at": "2012-01-01T12:00:00Z"
+}
+```
+
+### Domain List
+
+List existing domains.
+
+```
+GET /apps/{app_id_or_name}/domains
+```
+
+
+#### Curl Example
+
+```bash
+$ curl -n https://<your-iruka-server>.com/api/v1-alpha/apps/$APP_ID_OR_NAME/domains
+```
+
+
+#### Response Example
+
+```
+HTTP/1.1 200 OK
+```
+
+```json
+[
+  {
+    "created_at": "2012-01-01T12:00:00Z",
+    "id": "01234567-89ab-cdef-0123-456789abcdef",
+    "hostname": "example.com",
+    "updated_at": "2012-01-01T12:00:00Z"
+  }
+]
+```
+
+
 

iruka/commands.go

@@ -9,6 +9,9 @@ var Commands = []cli.Command{
 	cmdCreate,
 	cmdConfig,
 	cmdDestroy,
+	cmdDomains,
+	cmdDomainAdd,
+	cmdDomainRemove,
 	cmdPs,
 	cmdDeploy,
 	cmdOpen,

iruka/domain-add.go

@@ -0,0 +1,47 @@
+package main
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/codegangsta/cli"
+
+	"github.com/spesnova/iruka/schema"
+)
+
+var cmdDomainAdd = cli.Command{
+	Name:  "domain-add",
+	Usage: "Add a custom domain to the app",
+	Description: `
+   $ iruka domain- add <DOMAIN>
+
+EXAMPLE:
+
+   $ iruka domain-add example.com
+   Adding example.com to example... done
+`,
+	Action: runDomainAdd,
+}
+
+func runDomainAdd(c *cli.Context) {
+	if len(c.Args()) < 1 {
+		cli.ShowCommandHelp(c, "add")
+		os.Exit(1)
+	}
+
+	appIdentity := getAppIdentity(c)
+	hostname := c.Args().First()
+	opts := schema.DomainCreateOpts{
+		Hostname: hostname,
+	}
+
+	fmt.Printf("Adding %s to %s...", hostname, appIdentity)
+	_, err := client.DomainCreate(appIdentity, opts)
+
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+
+	fmt.Println("done")
+}

iruka/domain-remove.go

@@ -0,0 +1,37 @@
+package main
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/codegangsta/cli"
+)
+
+var cmdDomainRemove = cli.Command{
+	Name:  "domain-remove",
+	Usage: "Remove a custom domain from the app",
+	Description: `
+   $ iruka domain-remove <Domain>
+
+EXAMPLE:
+
+   $ iruka domain-remove example.com
+   Removing example.com from example... done
+`,
+	Action: runDomainRemove,
+}
+
+func runDomainRemove(c *cli.Context) {
+	appIdentity := getAppIdentity(c)
+	hostname := c.Args().First()
+
+	fmt.Printf("Removing %s from %s...", hostname, appIdentity)
+	err := client.DomainDelete(appIdentity, hostname)
+
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+
+	fmt.Println("done")
+}