Moved all backend code into the backend/ directory

Makefile

@@ -10,10 +10,10 @@ release:
 	git push --tags
 
 build-static:
-	docker build -t gcr.io/dworken-k8s/hishtory-static -f web/caddy/Dockerfile .
+	docker build -t gcr.io/dworken-k8s/hishtory-static -f backend/web/caddy/Dockerfile .
 
 build-api:
-	docker build -t gcr.io/dworken-k8s/hishtory-api -f server/Dockerfile . 
+	docker build -t gcr.io/dworken-k8s/hishtory-api -f backend/server/Dockerfile . 
 
 deploy-static: build-static
 	docker push gcr.io/dworken-k8s/hishtory-static

backend/server/Dockerfile

@@ -0,0 +1,8 @@
+FROM golang:1.17
+COPY go.mod ./
+COPY go.sum ./
+RUN unset GOPATH; go mod download
+COPY . ./
+RUN unset GOPATH; go build -o /server -ldflags "-X main.ReleaseVersion=v0.`cat VERSION`" backend/server/server.go
+CMD [ "/server" ]
+

backend/web/caddy/Dockerfile

@@ -2,5 +2,5 @@ FROM abiosoft/caddy
 
 LABEL "com.datadoghq.ad.logs"='[{"source": "caddy", "service": "web"}]'
 
-COPY web/caddy/Caddyfile /etc/
-COPY web/landing/www/ /srv/landing
+COPY backend/web/caddy/Caddyfile /etc/
+COPY backend/web/landing/www/ /srv/landing

server/Dockerfile

@@ -3,6 +3,6 @@ COPY go.mod ./
 COPY go.sum ./
 RUN unset GOPATH; go mod download
 COPY . ./
-RUN unset GOPATH; cat VERSION; go build -o /server -ldflags "-X main.ReleaseVersion=v0.`cat VERSION`" server/server.go
+RUN unset GOPATH; cat VERSION; go build -o /server -ldflags "-X main.ReleaseVersion=v0.`cat VERSION`" backend/server/server.go
 CMD [ "/server" ]
 

shared/testutils.go

@@ -40,7 +40,7 @@ func buildServer(t *testing.T) {
 	if err != nil {
 		t.Fatalf("failed to chdir: %v", err)
 	}
-	cmd := exec.Command("go", "build", "-o", "/tmp/server", "server/server.go")
+	cmd := exec.Command("go", "build", "-o", "/tmp/server", "backend/server/server.go")
 	var stdout bytes.Buffer
 	cmd.Stdout = &stdout
 	var stderr bytes.Buffer