remove /static file server and don’t copy kubernikusctl to prod image

sapcc · Nov 16, 2017 · 0116947 · 0116947
1 parent aec672d
commit 0116947
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -11,7 +11,7 @@ RUN curl -Lo /bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/
 	&& dumb-init -V
 COPY charts/ /etc/kubernikus/charts
 COPY --from=kubernikus-binaries /apiserver /kubernikus /wormhole /usr/local/bin/
-COPY --from=kubernikus-binaries /kubernikusctl /static/binaries/linux/amd64/kubernikusctl
+#COPY --from=kubernikus-binaries /kubernikusctl /static/binaries/linux/amd64/kubernikusctl
 COPY --from=kubernikus-docs /public/docs /static/docs
 ENTRYPOINT ["dumb-init", "--"]
 CMD ["apiserver"]
diff --git a/pkg/api/rest/configure_kubernikus.go b/pkg/api/rest/configure_kubernikus.go
@@ -72,10 +72,6 @@ func StaticFiles(next http.Handler) http.Handler {
 			http.StripPrefix("/docs", http.FileServer(http.Dir("static/docs"))).ServeHTTP(rw, r)
 			return
 		}
-		if strings.HasPrefix(r.URL.Path, "/static") {
-			http.StripPrefix("/static", http.FileServer(http.Dir("static"))).ServeHTTP(rw, r)
-			return
-		}
 		next.ServeHTTP(rw, r)
 	})
 }