From 657150ca9b2e68b8a12ad7d889fde9c2479a6126 Mon Sep 17 00:00:00 2001
From: Diogo Monica <diogo@docker.com>
Date: Tue, 14 Jul 2015 15:46:21 -0700
Subject: [PATCH 1/2] Working docker build/docker compose

Signed-off-by: Diogo Monica <diogo@docker.com>
---
 docker-compose.yml                            | 14 ++++++++------
 Dockerfile => notary-server-Dockerfile        |  3 +++
 signer/Dockerfile => notary-signer-Dockerfile |  6 ++++--
 3 files changed, 15 insertions(+), 8 deletions(-)
 rename Dockerfile => notary-server-Dockerfile (83%)
 rename signer/Dockerfile => notary-signer-Dockerfile (74%)

diff --git a/docker-compose.yml b/docker-compose.yml
index 7e811cea58..b14e151ced 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,15 +1,17 @@
-notary:
+notaryserver:
   build: .
+  dockerfile: notary-server-Dockerfile
   links:
    - notarymysql
   ports:
    - "8080:8080"
    - "4443:4443"
-#rufus:
-#  volumes:
-#   - /dev/bus/usb/003/010:/dev/bus/usb/002/010
-#   - /var/run/pcscd/pcscd.comm:/var/run/pcscd/pcscd.comm
-#  build: ../rufus
+notarysigner:
+  volumes:
+   - /dev/bus/usb/003/010:/dev/bus/usb/002/010
+   - /var/run/pcscd/pcscd.comm:/var/run/pcscd/pcscd.comm
+  build: .
+  dockerfile: notary-signer-Dockerfile
 notarymysql:
   build: ./notarymysql/
   ports:
diff --git a/Dockerfile b/notary-server-Dockerfile
similarity index 83%
rename from Dockerfile
rename to notary-server-Dockerfile
index fb8803d165..fe0a82202b 100644
--- a/Dockerfile
+++ b/notary-server-Dockerfile
@@ -2,6 +2,9 @@ FROM golang
 
 COPY . /go/src/github.com/docker/notary
 
+RUN apt-get update && apt-get install -y \
+    libltdl-dev
+
 ENV GOPATH /go/src/github.com/docker/notary/Godeps/_workspace:$GOPATH
 
 RUN go install github.com/docker/notary/cmd/notary-server
diff --git a/signer/Dockerfile b/notary-signer-Dockerfile
similarity index 74%
rename from signer/Dockerfile
rename to notary-signer-Dockerfile
index f821898cbe..d2db3482e8 100644
--- a/signer/Dockerfile
+++ b/notary-signer-Dockerfile
@@ -18,10 +18,12 @@ RUN softhsm2-util --init-token --slot 0 --label "test_token" --pin $PIN --so-pin
 # Copy the local repo to the expected go path
 COPY . /go/src/github.com/docker/notary
 
+ENV GOPATH /go/src/github.com/docker/notary/Godeps/_workspace:$GOPATH
+
 # Install notary-signer
-RUN go get github.com/docker/notary/cmd/notary-signer
+RUN go install github.com/docker/notary/cmd/notary-signer
 
 EXPOSE 4443
 
 #ENTRYPOINT rufus -cert /go/src/github.com/docker/notary/fixtures/rufus.pem -key /go/src/github.com/docker/notary/fixtures/rufus.key -debug -pkcs11 /usr/lib/x86_64-linux-gnu/opensc-pkcs11.so -pin 123456
-ENTRYPOINT rufus -cert /go/src/github.com/docker/notary/fixtures/rufus.pem -key /go/src/github.com/docker/notary/fixtures/rufus.key -debug -pkcs11 $LIBDIR/libsofthsm2.so -pin 1234
+ENTRYPOINT notary-signer -cert /go/src/github.com/docker/notary/fixtures/rufus.pem -key /go/src/github.com/docker/notary/fixtures/rufus.key -debug -pkcs11 $LIBDIR/libsofthsm2.so -pin 1234

From 394237cfe690db62abce9b387f22ec4a665f5917 Mon Sep 17 00:00:00 2001
From: Diogo Monica <diogo@docker.com>
Date: Tue, 14 Jul 2015 15:57:11 -0700
Subject: [PATCH 2/2] Adding link to notary-signer in dockerfile

Signed-off-by: Diogo Monica <diogo@docker.com>
---
 docker-compose.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index b14e151ced..25280fa895 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,6 +12,8 @@ notarysigner:
    - /var/run/pcscd/pcscd.comm:/var/run/pcscd/pcscd.comm
   build: .
   dockerfile: notary-signer-Dockerfile
+  links:
+   - notarymysql
 notarymysql:
   build: ./notarymysql/
   ports: