Fix Dockerfile and Makefile

Dockerfile

@@ -36,9 +36,7 @@ COPY ./internal/auth/*.go ./internal/auth/
 COPY ./internal/session/*.go ./internal/session/
 COPY ./internal/passwords/*.go ./internal/passwords/
 COPY ./internal/webmention/*.go ./internal/webmention/
-COPY ./types/*.go ./types/
+COPY ./cmd/spyda/*.go ./cmd/spyda/
-COPY ./types/retwt/*.go ./types/retwt/
-COPY ./cmd/twtd/*.go ./cmd/twtd/
 
 # Version/Commit (there there is no .git in Docker build context)
 # NOTE: This is fairly low down in the Dockerfile instructions so
@@ -62,7 +60,7 @@ VOLUME /data
 # force cgo resolver
 ENV GODEBUG=netdns=cgo
 
-COPY --from=build /src/twtd /twtd
+COPY --from=build /src/spyda /spyda
 
-ENTRYPOINT ["/twtd"]
+ENTRYPOINT ["/spyda"]
 CMD [""]

Makefile

@@ -12,24 +12,16 @@ deps:
 
 dev : DEBUG=1
 dev : build 
-	@./twt -v
+	@./spyda -D
-	@./twtd -D -O -R
-
-cli:
-	@go build -tags "netgo static_build" -installsuffix netgo \
-		-ldflags "-w \
-		-X $(shell go list).Version=$(VERSION) \
-		-X $(shell go list).Commit=$(COMMIT)" \
-		./cmd/twt/...
 
 server: generate
 	@go build -tags "netgo static_build" -installsuffix netgo \
 		-ldflags "-w \
 		-X $(shell go list).Version=$(VERSION) \
 		-X $(shell go list).Commit=$(COMMIT)" \
-		./cmd/twtd/...
+		./cmd/spyda/...
 
-build: cli server
+build: server
 
 generate:
 	@if [ x"$(DEBUG)" = x"1"  ]; then		\
@@ -43,8 +35,7 @@ generate:
 	fi
 
 install: build
-	@go install ./cmd/twt/...
+	@go install ./cmd/spyda/...
-	@go install ./cmd/twtd/...
 
 ifeq ($(PUBLISH), 1)
 image: