1
0
mirror of https://github.com/bitwarden/browser synced 2025-12-10 13:23:34 +00:00

BRE-925/switch-web-to-alpine (#15270)

* update dockerfile and entrypoint script

* update entrypoint to sh

* add icu-libs to web container to fix startup errors

* remaining change needed for icu-libs

* pin alpine and update apk add commands
This commit is contained in:
aj-bw
2025-07-28 10:58:30 -04:00
committed by GitHub
parent f4254ba920
commit 79a71c71e3
3 changed files with 19 additions and 22 deletions

View File

@@ -280,7 +280,7 @@ jobs:
IMAGE_NAME: ${{ steps.image-name.outputs.name }} IMAGE_NAME: ${{ steps.image-name.outputs.name }}
run: | run: |
mkdir build mkdir build
docker run --rm --volume $(pwd)/build:/temp --entrypoint bash \ docker run --rm --volume $(pwd)/build:/temp --entrypoint sh \
$IMAGE_NAME -c "cp -r ./ /temp" $IMAGE_NAME -c "cp -r ./ /temp"
zip -r web-${{ env._VERSION }}-${{ matrix.artifact_name }}.zip build zip -r web-${{ env._VERSION }}-${{ matrix.artifact_name }}.zip build

View File

@@ -1,23 +1,22 @@
############################################### ###############################################
# Build stage 1 # # Node.js build stage (alpine) #
############################################### ###############################################
ARG NODE_VERSION=20 ARG NODE_VERSION=20
FROM --platform=$BUILDPLATFORM node:${NODE_VERSION} AS node-build FROM --platform=$BUILDPLATFORM node:${NODE_VERSION}-alpine AS node-build
ARG NPM_COMMAND=dist:bit:selfhost
WORKDIR /source WORKDIR /source
COPY package*.json ./
COPY . . COPY . .
RUN npm ci RUN npm ci
WORKDIR /source/apps/web WORKDIR /source/apps/web
ARG NPM_COMMAND=dist:bit:selfhost
RUN npm run ${NPM_COMMAND} RUN npm run ${NPM_COMMAND}
############################################### ###############################################
# Build stage 2 # # Build stage 2 #
############################################### ###############################################
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-alpine3.21 AS build
# Docker buildx supplies the value for this arg # Docker buildx supplies the value for this arg
ARG TARGETPLATFORM ARG TARGETPLATFORM
@@ -25,11 +24,11 @@ ARG TARGETPLATFORM
# Determine proper runtime value for .NET # Determine proper runtime value for .NET
# We put the value in a file to be read by later layers. # We put the value in a file to be read by later layers.
RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \ RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \
RID=linux-x64 ; \ RID=linux-musl-x64 ; \
elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then \ elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then \
RID=linux-arm64 ; \ RID=linux-musl-arm64 ; \
elif [ "$TARGETPLATFORM" = "linux/arm/v7" ]; then \ elif [ "$TARGETPLATFORM" = "linux/arm/v7" ]; then \
RID=linux-arm ; \ RID=linux-musl-arm ; \
fi \ fi \
&& echo "RID=$RID" > /tmp/rid.txt && echo "RID=$RID" > /tmp/rid.txt
@@ -57,19 +56,18 @@ WORKDIR /app
############################################### ###############################################
# App stage # # App stage #
############################################### ###############################################
FROM mcr.microsoft.com/dotnet/aspnet:8.0 FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine3.21
ARG TARGETPLATFORM ARG TARGETPLATFORM
LABEL com.bitwarden.product="bitwarden" LABEL com.bitwarden.product="bitwarden"
ENV ASPNETCORE_ENVIRONMENT=Production ENV ASPNETCORE_ENVIRONMENT=Production
ENV ASPNETCORE_URLS=http://+:5000 ENV ASPNETCORE_URLS=http://+:5000
ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
EXPOSE 5000 EXPOSE 5000
RUN apt-get update \ RUN apk add --no-cache curl \
&& apt-get install -y --no-install-recommends \ icu-libs \
gosu \ && apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community gosu
curl \
&& rm -rf /var/lib/apt/lists/*
# Copy app from the build stage # Copy app from the build stage
WORKDIR /bitwarden_server WORKDIR /bitwarden_server

View File

@@ -1,4 +1,4 @@
#!/bin/bash #!/bin/sh
# Setup # Setup
@@ -22,11 +22,10 @@ fi
if [ "$(id -u)" = "0" ]; then if [ "$(id -u)" = "0" ]; then
# Create user and group # Create user and group
groupadd -o -g $LGID $GROUPNAME >/dev/null 2>&1 || addgroup -g "$LGID" -S "$GROUPNAME" 2>/dev/null || true
groupmod -o -g $LGID $GROUPNAME >/dev/null 2>&1 adduser -u "$LUID" -G "$GROUPNAME" -S -D -H "$USERNAME" 2>/dev/null || true
useradd -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1 || mkdir -p /home/$USERNAME
usermod -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1 chown $USERNAME:$GROUPNAME /home/$USERNAME
mkhomedir_helper $USERNAME
# The rest... # The rest...