From c48512798ec8313b91b7c06c6064e144fdb44515 Mon Sep 17 00:00:00 2001 From: Thomas Date: Thu, 13 Jun 2019 11:34:28 +0200 Subject: [PATCH 1/2] cli: Replace deprecated function for getting Prometheus handler (#281) --- cmd/tusd/cli/metrics.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/tusd/cli/metrics.go b/cmd/tusd/cli/metrics.go index 6836c19..960cb25 100644 --- a/cmd/tusd/cli/metrics.go +++ b/cmd/tusd/cli/metrics.go @@ -7,6 +7,7 @@ import ( "github.com/tus/tusd/prometheuscollector" "github.com/prometheus/client_golang/prometheus" + "github.com/prometheus/client_golang/prometheus/promhttp" ) var MetricsOpenConnections = prometheus.NewGauge(prometheus.GaugeOpts{ @@ -28,5 +29,5 @@ func SetupMetrics(handler *tusd.Handler) { prometheus.MustRegister(prometheuscollector.New(handler.Metrics)) stdout.Printf("Using %s as the metrics path.\n", Flags.MetricsPath) - http.Handle(Flags.MetricsPath, prometheus.Handler()) + http.Handle(Flags.MetricsPath, promhttp.Handler()) } From a6ebba689fc02d63735d81bc041b84dcbd37c7c4 Mon Sep 17 00:00:00 2001 From: Thomas Date: Thu, 13 Jun 2019 11:58:16 +0200 Subject: [PATCH 2/2] misc: Set the docker user to tusd. (#282) --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 5789cad..1a0652e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,3 +33,5 @@ WORKDIR /srv/tusd-data EXPOSE 1080 ENTRYPOINT ["tusd"] CMD ["--hooks-dir","/srv/tusd-hooks"] + +USER tusd