Merge pull request #58 from docker/fixing-docker-building

Working docker build/docker compose

docker-compose.yml

@@ -1,15 +1,19 @@
-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
+  links:
+   - notarymysql
 notarymysql:
   build: ./notarymysql/
   ports:

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

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