Make docker build work

1 files changed, 3 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index cc3fc5f..6baad7f 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ IMAGE=docker.crute.me/ssh-proxy
 BINARY=ssh-proxy
 CLIENT_BINARY=ssh-proxy-client
 
-$(BINARY): $(CLIENT_BINARY) $(shell find . -name '*.go')
+$(BINARY): $(CLIENT_BINARY) $(shell find . -name '*.go' -o -name '*.tpl' -o -name '*.js')
         @[ "$(CLIENT_ID)" ] || ( echo "CLIENT_ID must be set"; exit 1 )
 
         CGO_ENABLED=0 go build \
@@ -26,7 +26,7 @@ vet: main.go
 
 .PHONY: docker
 docker: $(BINARY)
-        mkdir docker; cp Dockerfile web-server docker; cd docker; \
+        mkdir docker; cp Dockerfile $(BINARY) docker; cd docker; \
         docker pull $(shell grep '^FROM ' Dockerfile | cut -d' ' -f2); \
         docker build --no-cache -t $(IMAGE):stage .
 
@@ -58,6 +58,6 @@ run-web: clean $(BINARY)
         test -n "$(VAULT_SECRET_ID)" # Caller must also export VAULT_SECRET_ID
         VAULT_ADDR="https://vault.sea4.crute.me:8200" \
                 VAULT_SKIP_VERIFY=true \
-                ./$(BINARY) --debug \
+                ./$(BINARY)  \
                 --hostname=dev.ssh-proxy.crute.me \
                 web