feat: allow images to run as non-root user

2026-01-04 01:23:25 +00:00 · 2025-04-23 13:45:09 -07:00
parent 5d7025dd99
commit 5bd7d2fa4a
37 changed files with 1145 additions and 326 deletions
--- a/util/Attachments/Dockerfile
+++ b/util/Attachments/Dockerfile
@@ -1,16 +1,68 @@
-FROM ghcr.io/bitwarden/server
+###############################################
+#                 Build stage                 #
+###############################################
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build

+# Docker buildx supplies the value for this arg
+ARG TARGETPLATFORM
+
+# Determine proper runtime value for .NET
+# We put the value in a file to be read by later layers.
+RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \
+    RID=linux-x64 ; \
+    elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then \
+    RID=linux-arm64 ; \
+    elif [ "$TARGETPLATFORM" = "linux/arm/v7" ]; then \
+    RID=linux-arm ; \
+    fi \
+    && echo "RID=$RID" > /tmp/rid.txt
+
+# Copy csproj files as distinct layers
+WORKDIR /source
+COPY util/Server/*.csproj ./util/Server/
+COPY Directory.Build.props .
+COPY .editorconfig .
+
+# Restore project dependencies and tools
+WORKDIR /source/util/Server
+RUN . /tmp/rid.txt && dotnet restore -r $RID
+
+# Copy required project files
+WORKDIR /source
+COPY util/Server/. ./util/Server/
+
+# Build project
+WORKDIR /source/util/Server
+RUN . /tmp/rid.txt && dotnet publish \
+    --self-contained \
+    /p:PublishSingleFile=true \
+    /p:SourceRevisionId="$GIT_COMMIT" \
+    -r $RID \
+    -o out
+
+WORKDIR /app
+
+###############################################
+#                  App stage                  #
+###############################################
+FROM mcr.microsoft.com/dotnet/aspnet:8.0
+
+ARG TARGETPLATFORM
 LABEL com.bitwarden.product="bitwarden"
+ENV ASPNETCORE_ENVIRONMENT=Production
+ENV ASPNETCORE_URLS=http://+:5000
+EXPOSE 5000

 RUN apt-get update \
    && apt-get install -y --no-install-recommends \
-        gosu \
-        curl \
+    gosu \
+    curl \
    && rm -rf /var/lib/apt/lists/*

-ENV ASPNETCORE_URLS http://+:5000
-EXPOSE 5000
-COPY entrypoint.sh /
+# Copy app from the build stage
+WORKDIR /bitwarden_server
+COPY --from=build /source/util/Server/out /bitwarden_server
+COPY util/Attachments/entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh

 HEALTHCHECK CMD curl -f http://localhost:5000/alive || exit 1
--- a/util/Attachments/entrypoint.sh
+++ b/util/Attachments/entrypoint.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash

 # Setup

@@ -19,19 +19,27 @@ then
    LGID=65534
 fi

-# Create user and group
+if [ "$(id -u)" = "0" ]
+then
+    # Create user and group

-groupadd -o -g $LGID $GROUPNAME >/dev/null 2>&1 ||
-groupmod -o -g $LGID $GROUPNAME >/dev/null 2>&1
-useradd -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1 ||
-usermod -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1
-mkhomedir_helper $USERNAME
+    groupadd -o -g $LGID $GROUPNAME >/dev/null 2>&1 ||
+    groupmod -o -g $LGID $GROUPNAME >/dev/null 2>&1
+    useradd -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1 ||
+    usermod -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1
+    mkhomedir_helper $USERNAME

-# The rest...
+    # The rest...

-chown -R $USERNAME:$GROUPNAME /bitwarden_server
-mkdir -p /etc/bitwarden/core/attachments
-chown -R $USERNAME:$GROUPNAME /etc/bitwarden
+    chown -R $USERNAME:$GROUPNAME /bitwarden_server
+    mkdir -p /etc/bitwarden/core/attachments
+    chown -R $USERNAME:$GROUPNAME /etc/bitwarden
+    gosu_cmd="gosu $USERNAME:$GROUPNAME"
+else
+    gosu_cmd=""
+fi

-exec gosu $USERNAME:$GROUPNAME dotnet /bitwarden_server/Server.dll \
-    /contentRoot=/etc/bitwarden/core/attachments /webRoot=. /serveUnknown=true
+exec $gosu_cmd /bitwarden_server/Server \
+    /contentRoot=/etc/bitwarden/core/attachments \
+    /webRoot=. \
+    /serveUnknown=true
--- a/util/MsSql/Dockerfile
+++ b/util/MsSql/Dockerfile
@@ -10,9 +10,9 @@ RUN apt-get update \
    tzdata \
    && rm -rf /var/lib/apt/lists/*

-COPY backup-db.sql /
-COPY backup-db.sh /
-COPY entrypoint.sh /
+COPY util/MsSql/backup-db.sql /
+COPY util/MsSql/backup-db.sh /
+COPY util/MsSql/entrypoint.sh /

 RUN chmod +x /entrypoint.sh \
    && chmod +x /backup-db.sh
--- a/util/MsSqlMigratorUtility/Dockerfile
+++ b/util/MsSqlMigratorUtility/Dockerfile
@@ -1,8 +1,67 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0
+###############################################
+#                 Build stage                 #
+###############################################
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+ARG GIT_COMMIT

-LABEL com.bitwarden.product="bitwarden"
+# Docker buildx supplies the value for this arg
+ARG TARGETPLATFORM
+
+# Determine proper runtime value for .NET
+# We put the value in a file to be read by later layers.
+RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \
+  RID=linux-x64 ; \
+  elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then \
+  RID=linux-arm64 ; \
+  elif [ "$TARGETPLATFORM" = "linux/arm/v7" ]; then \
+  RID=linux-arm ; \
+  fi \
+  && echo "RID=$RID" > /tmp/rid.txt
+
+# Copy csproj files as distinct layers
+WORKDIR /source
+COPY util/MsSqlMigratorUtility/*.csproj ./util/MsSqlMigratorUtility/
+COPY src/Core/*.csproj ./src/Core/
+COPY util/Migrator/*.csproj ./util/Migrator/
+COPY util/Server/*.csproj ./util/Server/
+COPY util/Server/Properties/*.csproj ./util/Server/Properties/
+COPY util/Server/Properties/launchSettings.json ./util/Server/Properties/
+COPY Directory.Build.props .
+
+# Restore project dependencies and tools
+WORKDIR /source/util/MsSqlMigratorUtility
+RUN . /tmp/rid.txt && dotnet restore -r $RID
+
+# Copy required project files
+WORKDIR /source
+COPY util/MsSqlMigratorUtility/. ./util/MsSqlMigratorUtility/
+COPY src/Core/. ./src/Core/
+COPY util/Migrator/. ./util/Migrator/
+COPY util/Server/. ./util/Server/
+COPY .git/. ./.git/
+COPY .editorconfig /source
+
+# Build project
+WORKDIR /source/util/MsSqlMigratorUtility
+RUN . /tmp/rid.txt && dotnet publish \
+  --self-contained \
+  /p:PublishSingleFile=true \
+  /p:SourceRevisionId="$GIT_COMMIT" \
+  -r $RID \
+  -o out

 WORKDIR /app
-COPY obj/build-output/publish .

-ENTRYPOINT ["sh", "-c", "dotnet /app/MsSqlMigratorUtility.dll \"${MSSQL_CONN_STRING}\" ${@}", "--" ]
+###############################################
+#                  App stage                  #
+###############################################
+FROM mcr.microsoft.com/dotnet/aspnet:8.0
+
+ARG TARGETPLATFORM
+LABEL com.bitwarden.product="bitwarden"
+
+# Copy app from the build stage
+WORKDIR /app
+COPY --from=build /source/util/MsSqlMigratorUtility/out /app
+
+ENTRYPOINT ["sh", "-c", "/app/MsSqlMigratorUtility \"${MSSQL_CONN_STRING}\" ${@}", "--" ]
--- a/util/Nginx/Dockerfile
+++ b/util/Nginx/Dockerfile
@@ -1,20 +1,21 @@
-FROM nginx:stable
+FROM --platform=$BUILDPLATFORM nginx:stable

+ARG TARGETPLATFORM
 LABEL com.bitwarden.product="bitwarden"

 RUN apt-get update \
    && apt-get install -y --no-install-recommends \
-        gosu \
-        curl \
+    gosu \
+    curl \
    && rm -rf /var/lib/apt/lists/*

-COPY nginx.conf /etc/nginx
-COPY proxy.conf /etc/nginx
-COPY mime.types /etc/nginx
-COPY security-headers.conf /etc/nginx
-COPY security-headers-ssl.conf /etc/nginx
-COPY logrotate.sh /
-COPY entrypoint.sh /
+COPY util/Nginx/nginx.conf /etc/nginx
+COPY util/Nginx/proxy.conf /etc/nginx
+COPY util/Nginx/mime.types /etc/nginx
+COPY util/Nginx/security-headers.conf /etc/nginx
+COPY util/Nginx/security-headers-ssl.conf /etc/nginx
+COPY util/Nginx/logrotate.sh /
+COPY util/Nginx/entrypoint.sh /

 EXPOSE 8080
 EXPOSE 8443
--- a/util/Server/Dockerfile
+++ b/util/Server/Dockerfile
@@ -1,5 +0,0 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0
-
-LABEL com.bitwarden.product="bitwarden"
-
-COPY obj/build-output/publish /bitwarden_server
--- a/util/Setup/Dockerfile
+++ b/util/Setup/Dockerfile
@@ -1,5 +1,58 @@
+###############################################
+#                 Build stage                 #
+###############################################
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+ARG GIT_COMMIT
+
+# Docker buildx supplies the value for this arg
+ARG TARGETPLATFORM
+
+# Determine proper runtime value for .NET
+# We put the value in a file to be read by later layers.
+RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \
+    RID=linux-x64 ; \
+    elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then \
+    RID=linux-arm64 ; \
+    elif [ "$TARGETPLATFORM" = "linux/arm/v7" ]; then \
+    RID=linux-arm ; \
+    fi \
+    && echo "RID=$RID" > /tmp/rid.txt
+
+# Copy csproj files as distinct layers
+WORKDIR /source
+COPY util/Setup/*.csproj ./util/Setup/
+COPY src/Core/*.csproj ./src/Core/
+COPY util/Migrator/*.csproj ./util/Migrator/
+COPY Directory.Build.props .
+
+# Restore project dependencies and tools
+WORKDIR /source/util/Setup
+RUN . /tmp/rid.txt && dotnet restore -r $RID
+
+# Copy required project files
+WORKDIR /source
+COPY util/Setup/. ./util/Setup/
+COPY src/Core/. ./src/Core/
+COPY util/Migrator/. ./util/Migrator/
+COPY .editorconfig /source
+
+# Build project
+WORKDIR /source/util/Setup
+RUN . /tmp/rid.txt && dotnet publish \
+    --self-contained \
+    /p:PublishSingleFile=true \
+    /p:SourceRevisionId="$GIT_COMMIT" \
+    -r $RID \
+    -o out
+
+WORKDIR /app
+
+###############################################
+#                  App stage                  #
+###############################################
 FROM mcr.microsoft.com/dotnet/aspnet:8.0

+ARG TARGETPLATFORM
 LABEL com.bitwarden.product="bitwarden" com.bitwarden.project="setup"

 RUN apt-get update \
@@ -8,9 +61,10 @@ RUN apt-get update \
    gosu \
    && rm -rf /var/lib/apt/lists/*

+# Copy app from the build stage
 WORKDIR /app
-COPY obj/build-output/publish .
-COPY entrypoint.sh /
+COPY --from=build /source/util/Setup/out .
+COPY util/Setup/entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh

 ENTRYPOINT ["/entrypoint.sh"]