diff --git a/.gitignore b/.gitignore
index daf913b..825a85a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,5 @@ _testmain.go
 *.exe
 *.test
 *.prof
+
+drone-docker
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..fbd7675
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,14 @@
+# Docker image for the docker plugin
+#
+#     docker build --rm=true -t plugins/drone-docker .
+
+FROM ubuntu:14.04
+
+RUN apt-get update -qq                               \
+	&& apt-get -y install curl                       \
+	&& curl -sSL https://get.docker.com/ubuntu/ | sh \
+	&& rm -rf /var/lib/apt/lists/*
+
+ADD drone-docker /go/bin/
+
+ENTRYPOINT ["/go/bin/drone-docker"]
diff --git a/README.md b/README.md
index dba0ca0..50659dd 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,33 @@
 # drone-docker
 Drone plugin for publishing Docker images
+
+
+## Docker
+
+Build the Docker container:
+
+```sh
+docker build --rm=true -t plugins/drone-docker .
+```
+
+Build and Publish a Docker container
+
+```sh
+docker run -i --privileged -v $(pwd):/drone/src plugins/drone-docker <<EOF
+{
+	"clone": {
+		"dir": "/drone/src"
+	},
+	"commit" : {
+		"sha": "9f2849d5",
+		"branch": "master"
+	},
+	"vargs": {
+		"username": "foo",
+		"password": "bar", 
+		"email": "foo@bar.com", 
+		"repo": "foo/bar"
+	}
+}
+EOF
+```
diff --git a/main.go b/main.go
new file mode 100644
index 0000000..b2d142e
--- /dev/null
+++ b/main.go
@@ -0,0 +1,103 @@
+package main
+
+import (
+	"fmt"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"strings"
+	"time"
+
+	"github.com/drone/drone-plugin-go/plugin"
+)
+
+type Docker struct {
+	Registry string `json:"registry"`
+	Username string `json:"username"`
+	Password string `json:"password"`
+	Email    string `json:"email"`
+	Repo     string `json:"repo"`
+	Tag      string `json:"tag"`
+	File     string `json:"file"`
+}
+
+func main() {
+	clone := plugin.Clone{}
+	vargs := Docker{}
+
+	plugin.Param("clone", &clone)
+	plugin.Param("vargs", &vargs)
+	if err := plugin.Parse(); err != nil {
+		println(err.Error())
+		os.Exit(1)
+	}
+
+	// Starts the Docker daemon
+	go func() {
+		cmd := exec.Command("docker", "-d")
+		cmd.Dir = clone.Dir
+		cmd.Stdout = ioutil.Discard
+		cmd.Stderr = ioutil.Discard
+		cmd.Run()
+	}()
+
+	// Sleep for a few seconds
+	time.Sleep(5 * time.Second)
+
+	// Set the Registry value
+	if len(vargs.Registry) == 0 {
+		vargs.Registry = "https://index.docker.io/v1/"
+	}
+	// Set the Dockerfile path
+	if len(vargs.File) == 0 {
+		vargs.File = "."
+	}
+	// Set the Tag value
+	switch vargs.Tag {
+	case "$DRONE_BRANCH":
+		vargs.Tag = clone.Branch
+	case "$DRONE_COMMIT":
+		vargs.Tag = clone.Sha
+	case "":
+		vargs.Tag = "latest"
+	}
+	vargs.Repo = fmt.Sprintf("%s:%s", vargs.Repo, vargs.Tag)
+
+	// Build the container
+	cmd := exec.Command("docker", "build", "--pull=true", "--rm=true", "-t", vargs.Repo, vargs.File)
+	cmd.Dir = clone.Dir
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	trace(cmd)
+	err := cmd.Run()
+	if err != nil {
+		os.Exit(1)
+	}
+
+	// Login to Docker
+	cmd = exec.Command("docker", "login", "-u", vargs.Username, "-p", vargs.Password, "-e", vargs.Email, "index.docker.io")
+	cmd.Dir = clone.Dir
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	err = cmd.Run()
+	if err != nil {
+		os.Exit(1)
+	}
+
+	// Push the container
+	cmd = exec.Command("docker", "push", vargs.Repo)
+	cmd.Dir = clone.Dir
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	trace(cmd)
+	err = cmd.Run()
+	if err != nil {
+		os.Exit(1)
+	}
+}
+
+// Trace writes each command to standard error (preceded by a ‘$ ’) before it
+// is executed. Used for debugging your build.
+func trace(cmd *exec.Cmd) {
+	fmt.Println("$", strings.Join(cmd.Args, " "))
+}