1 files changed, 42 insertions, 12 deletions

diff --git a/Makefile b/Makefile
index 3e599d0..6038948 100644
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,52 @@
-IMAGE="docker.crute.me/websocket-proxy"
-VERSION="0.1.0"
+IMAGE=docker.crute.me/ssh-proxy
+BINARY=ssh-proxy
 
-websocket-proxy: main.go sockets.go server.go client.go localclient.go
-        CGO_ENABLED=0 go build -ldflags "-X main.version=$(VERSION)" -o $@ $^
+$(BINARY): $(shell find . -name '*.go')
+        @[ "$(CLIENT_ID)" ] || ( echo "CLIENT_ID must be set"; exit 1 )
+
+        CGO_ENABLED=0 go build \
+                -ldflags "-X main.appVersion=$(shell git describe --long --tags --dirty --always) \
+                                  -X code.crute.us/mcrute/ssh-proxy/cmd/client.clientId=$(CLIENT_ID)"  \
+                -o $@
+
+.PHONY: vet
+vet: main.go
+        go vet $<
 
 .PHONY: docker
-docker: websocket-proxy
-        mkdir docker; \
-        cp Dockerfile websocket-proxy docker; \
-        cd docker; \
-        docker build -t $(IMAGE):$(VERSION) .
+docker: $(BINARY)
+        mkdir docker; cp Dockerfile web-server docker; cd docker; \
+        docker pull $(shell grep '^FROM ' Dockerfile | cut -d' ' -f2); \
+        docker build --no-cache -t $(IMAGE):stage .
 
 .PHONY: publish
 publish:
-        docker push $(IMAGE):$(VERSION)
-        docker tag $(IMAGE):$(VERSION) $(IMAGE):latest
+        docker push $(IMAGE):stage
+
+.PHONY: publish-prod
+publish-prod:
+        docker tag $(IMAGE):stage $(IMAGE):latest
         docker push $(IMAGE):latest
 
 .PHONY: clean
 clean:
-        rm -rf websocket-proxy docker
+        rm -rf docker || true
+        rm $(BINARY) || true
+
+.PHONY: run-backfill
+run-backfill: clean $(BINARY)
+        test -n "$(VAULT_ROLE_ID)" # Caller must export VAULT_ROLE_ID
+        test -n "$(VAULT_SECRET_ID)" # Caller must also export VAULT_SECRET_ID
+        VAULT_ADDR="https://vault.sea4.crute.me:8200" \
+                VAULT_SKIP_VERIFY=true \
+                ./web-server backfill-shakes
+
+.PHONY: run-web
+run-web: clean $(BINARY)
+        test -n "$(VAULT_ROLE_ID)" # Caller must export VAULT_ROLE_ID
+        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 \
+                --hostname=dev.ssh-proxy.crute.me \
+                web