Merge branch 'master' into fix-channels

target · Jul 3, 2020 · df5bbc3 · df5bbc3
2 parents f2991dd + 6cb81cc
commit df5bbc3
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 4 deletions.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -16,9 +16,15 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 \
     -o flottbot ./cmd/flottbot
 
 FROM alpine:3.11
-RUN apk --no-cache add ca-certificates && mkdir config
+ENV USERNAME=flottbot
+ENV GROUP=flottbot
+ENV UID=900
+ENV GID=900
+RUN apk --no-cache add ca-certificates && mkdir config && \
+  addgroup -g "$GID" -S "$GROUP" && adduser -S -u "$UID" -G "$GROUP" "$USERNAME"
 COPY --from=build /src/flottbot /flottbot
 
 EXPOSE 3000 4000 8080
 
+USER ${USERNAME}
 CMD [ "/flottbot" ]
diff --git a/docker/Dockerfile.golang b/docker/Dockerfile.golang
@@ -16,9 +16,15 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 \
     -o flottbot ./cmd/flottbot
 
 FROM golang:1.14-alpine
-RUN apk --no-cache add ca-certificates && mkdir config
+ENV USERNAME=flottbot
+ENV GROUP=flottbot
+ENV UID=900
+ENV GID=900
+RUN apk --no-cache add ca-certificates && mkdir config && \
+  addgroup -g "$GID" -S "$GROUP" && adduser -S -u "$UID" -G "$GROUP" "$USERNAME"
 COPY --from=build /src/flottbot /flottbot
 
 EXPOSE 3000 4000 8080
 
+USER ${USERNAME}
 CMD [ "/flottbot" ]
diff --git a/docker/Dockerfile.python b/docker/Dockerfile.python
@@ -16,9 +16,15 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 \
     -o flottbot ./cmd/flottbot
 
 FROM python:3-alpine
-RUN apk --no-cache add ca-certificates && mkdir config
+ENV USERNAME=flottbot
+ENV GROUP=flottbot
+ENV UID=900
+ENV GID=900
+RUN apk --no-cache add ca-certificates && mkdir config && \
+  addgroup -g "$GID" -S "$GROUP" && adduser -S -u "$UID" -G "$GROUP" "$USERNAME"
 COPY --from=build /src/flottbot /flottbot
 
 EXPOSE 8080 3000 4000
 
+USER ${USERNAME}
 CMD ["/flottbot"]
diff --git a/docker/Dockerfile.ruby b/docker/Dockerfile.ruby
@@ -16,9 +16,15 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 \
     -o flottbot ./cmd/flottbot
 
 FROM ruby:2.7-alpine
-RUN apk add --no-cache ca-certificates ruby-dev build-base && mkdir config
+ENV USERNAME=flottbot
+ENV GROUP=flottbot
+ENV UID=900
+ENV GID=900
+RUN apk add --no-cache ca-certificates ruby-dev build-base && mkdir config &&  \
+  addgroup -g "$GID" -S "$GROUP" && adduser -S -u "$UID" -G "$GROUP" "$USERNAME"
 COPY --from=build /src/flottbot /flottbot
 
 EXPOSE 8080 3000 4000
 
+USER ${USERNAME}
 CMD ["/flottbot"]