Set unprivileged user to container image

Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>
open-telemetry · Mar 30, 2021 · c78c3fd · c78c3fd
1 parent 791c7f9
commit c78c3fd
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 10 deletions.
diff --git a/cmd/otelcontribcol/Dockerfile b/cmd/otelcontribcol/Dockerfile
@@ -2,8 +2,12 @@ FROM alpine:latest as certs
 RUN apk --update add ca-certificates
 
 FROM scratch
+
+ARG USER_UID=10001
+USER ${USER_UID}
+
 COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 COPY otelcontribcol /
-EXPOSE 55680 55679
+EXPOSE 4317 55680 55679
 ENTRYPOINT ["/otelcontribcol"]
 CMD ["--config", "/etc/otel/config.yaml"]
diff --git a/examples/tracing/Dockerfile b/examples/tracing/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.14 AS build
+FROM golang:1.16 AS build
 
 WORKDIR /src
 ADD . /src
@@ -9,7 +9,11 @@ FROM alpine:latest as certs
 RUN apk --update add ca-certificates
 
 FROM scratch
+
+ARG USER_UID=10001
+USER ${USER_UID}
+
 COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 COPY --from=build /src/bin/otelcontribcol_linux_amd64 /otelcontribcol
 ENTRYPOINT ["/otelcontribcol"]
-EXPOSE 55680 55679
+EXPOSE 4317 55680 55679
diff --git a/exporter/loadbalancingexporter/example/Dockerfile b/exporter/loadbalancingexporter/example/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.14 AS build
+FROM golang:1.16 AS build
 
 WORKDIR /src
 ADD . /src
@@ -9,7 +9,11 @@ FROM alpine:latest as certs
 RUN apk --update add ca-certificates
 
 FROM scratch
+
+ARG USER_UID=10001
+USER ${USER_UID}
+
 COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 COPY --from=build /src/bin/otelcontribcol_linux_amd64 /otelcontribcol
 ENTRYPOINT ["/otelcontribcol"]
-EXPOSE 55680 55679
+EXPOSE 4317 55680 55679
diff --git a/exporter/lokiexporter/example/Dockerfile b/exporter/lokiexporter/example/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.14 AS build
+FROM golang:1.16 AS build
 
 WORKDIR /src
 ADD . /src
@@ -9,7 +9,11 @@ FROM alpine:latest as certs
 RUN apk --update add ca-certificates
 
 FROM scratch
+
+ARG USER_UID=10001
+USER ${USER_UID}
+
 COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 COPY --from=build /src/bin/otelcontribcol_linux_amd64 /otelcontribcol
 ENTRYPOINT ["/otelcontribcol"]
-EXPOSE 55680 55679
+EXPOSE 4317 55680 55679
diff --git a/exporter/splunkhecexporter/example/Dockerfile b/exporter/splunkhecexporter/example/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.14 AS build
+FROM golang:1.16 AS build
 
 WORKDIR /src
 ADD . /src
@@ -9,7 +9,11 @@ FROM alpine:latest as certs
 RUN apk --update add ca-certificates
 
 FROM scratch
+
+ARG USER_UID=10001
+USER ${USER_UID}
+
 COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 COPY --from=build /src/bin/otelcontribcol_linux_amd64 /otelcontribcol
 ENTRYPOINT ["/otelcontribcol"]
-EXPOSE 55680 55679
+EXPOSE 4317 55680 55679
diff --git a/receiver/simpleprometheusreceiver/examples/federation/prom-counter/Dockerfile b/receiver/simpleprometheusreceiver/examples/federation/prom-counter/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.14-stretch
+FROM golang:1.16-stretch
 
 WORKDIR /go/src/app