diff --git a/cmd/api.go b/cmd/api.go index a7ceac7..437e84e 100644 --- a/cmd/api.go +++ b/cmd/api.go @@ -12,7 +12,6 @@ import ( "google.golang.org/grpc/reflection" "log" "net/http" - "os" "path" "strings" @@ -20,13 +19,7 @@ import ( "google.golang.org/grpc" ) -var workingDirectory string - func main() { - dir, err := os.Getwd(); if err != nil { - log.Fatal(err) - } - workingDirectory = dir server := grpc.NewServer(buildServerOpts()...) reflection.Register(server) @@ -75,7 +68,7 @@ func openapiFileHandler() http.Handler { log.Printf("Serving %s", r.URL.Path) p := strings.TrimPrefix(r.URL.Path, "/openapiv2/") - p = path.Join(workingDirectory, "gen/openapiv2/", p) + p = path.Join("gen/openapiv2/", p) http.ServeFile(w, r, p) }) } @@ -92,7 +85,7 @@ func swaggerUIHandler() http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { log.Printf("Serving %s", r.URL.Path) p := strings.TrimPrefix(r.URL.Path, "/swagger-ui/") - p = path.Join(workingDirectory, "swagger-ui/", p) + p = path.Join("swagger-ui/", p) http.ServeFile(w, r, p) }) } diff --git a/docker-compose.yml b/docker-compose.yml index da2667d..3211619 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ services: api: build: context: . - dockerfile: ./infra/dev/. + dockerfile: ./infra/dev/Dockerfile ports: - '8080:8080' working_dir: /opt/app diff --git a/infra/prod/Dockerfile b/infra/prod/Dockerfile index c0fb458..db795c7 100644 --- a/infra/prod/Dockerfile +++ b/infra/prod/Dockerfile @@ -21,6 +21,8 @@ RUN apt-get update RUN apt-get install -y ca-certificates COPY --from=builder /bin/api /bin/api +COPY --from=builder /opt/app/swagger-ui ./swagger-ui +COPY --from=builder /opt/app/gen/openapiv2 ./gen/openapiv2 # Start API ENTRYPOINT /bin/api