nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-26 07:12:20 -05:00
Code

Switch Dockerfile to multi-arch build

Browse Source
This commit is contained in:
Vince Grassia 2023-11-09 12:28:12 -05:00
parent 4cf2142b68
commit 0244cc9201
No known key found for this signature in database
GPG Key ID: 9AD7505E8448CC08
2 changed files with 100 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
.github/workflows/build.yml vendored
View File

@ -94,6 +94,7 @@ jobs:
fail-on-error: true fail-on-error: true
build-artifacts: build-artifacts:
if: false
name: Build artifacts name: Build artifacts
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
needs: needs:
@ -194,59 +195,48 @@ jobs:
build-docker: build-docker:
name: Build Docker images name: Build Docker images
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
needs: build-artifacts needs:
- lint
- testing
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
include: include:
- project_name: Admin - project_name: Admin
base_path: ./src base_path: ./src
dotnet: true # - project_name: Api
- project_name: Api # base_path: ./src
base_path: ./src # - project_name: Attachments
dotnet: true # base_path: ./util
- project_name: Attachments # - project_name: Billing
base_path: ./util # base_path: ./src
- project_name: Billing # - project_name: Events
base_path: ./src # base_path: ./src
dotnet: true # - project_name: EventsProcessor
- project_name: Events # base_path: ./src
base_path: ./src # - project_name: Icons
dotnet: true # base_path: ./src
- project_name: EventsProcessor # - project_name: Identity
base_path: ./src # base_path: ./src
dotnet: true # - project_name: MsSql
- project_name: Icons # base_path: ./util
base_path: ./src # - project_name: MsSqlMigratorUtility
dotnet: true # base_path: ./util
- project_name: Identity # - project_name: Nginx
base_path: ./src # base_path: ./util
dotnet: true # - project_name: Notifications
- project_name: MsSql # base_path: ./src
base_path: ./util # - project_name: Scim
- project_name: MsSqlMigratorUtility # base_path: ./bitwarden_license/src
base_path: ./util # - project_name: Server
dotnet: true # base_path: ./util
- project_name: Nginx # - project_name: Setup
base_path: ./util # base_path: ./util
- project_name: Notifications # - project_name: Sso
base_path: ./src # base_path: ./bitwarden_license/src
dotnet: true
- project_name: Scim
base_path: ./bitwarden_license/src
dotnet: true
- project_name: Server
base_path: ./util
dotnet: true
- project_name: Setup
base_path: ./util
dotnet: true
- project_name: Sso
base_path: ./bitwarden_license/src
dotnet: true
steps: steps:
- name: Checkout repo - name: Checkout repo
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Check Branch to Publish - name: Check Branch to Publish
env: env:
@ -261,6 +251,13 @@ jobs:
echo "is_publish_branch=false" >> $GITHUB_ENV echo "is_publish_branch=false" >> $GITHUB_ENV
fi fi
########## Set up Docker ##########
- name: Set up QEMU emulators
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
########## ACRs ########## ########## ACRs ##########
- name: Login to Azure - PROD Subscription - name: Login to Azure - PROD Subscription
uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.7 uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.7
@ -268,7 +265,7 @@ jobs:
creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }} creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}
- name: Login to PROD ACR - name: Login to PROD ACR
run: az acr login -n bitwardenprod run: az acr login -n ${_AZ_REGISTRY%.azurecr.io}
- name: Login to Azure - CI Subscription - name: Login to Azure - CI Subscription
uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.7 uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.7
@ -307,37 +304,30 @@ jobs:
PROJECT_NAME: ${{ steps.setup.outputs.project_name }} PROJECT_NAME: ${{ steps.setup.outputs.project_name }}
run: echo "name=${_AZ_REGISTRY}/${PROJECT_NAME}:${IMAGE_TAG}" >> $GITHUB_OUTPUT run: echo "name=${_AZ_REGISTRY}/${PROJECT_NAME}:${IMAGE_TAG}" >> $GITHUB_OUTPUT
- name: Get build artifact
if: ${{ matrix.dotnet }}
uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
with:
name: ${{ matrix.project_name }}.zip
- name: Setup build artifact
if: ${{ matrix.dotnet }}
run: |
mkdir -p ${{ matrix.base_path}}/${{ matrix.project_name }}/obj/build-output/publish
unzip ${{ matrix.project_name }}.zip \
-d ${{ matrix.base_path }}/${{ matrix.project_name }}/obj/build-output/publish
- name: Build Docker image - name: Build Docker image
uses: docker/build-push-action@1104d471370f9806843c095c1db02b5a90c5f8b6 # v3.3.1 uses: docker/build-push-action@1104d471370f9806843c095c1db02b5a90c5f8b6 # v3.3.1
with: with:
context: ${{ matrix.base_path }}/${{ matrix.project_name }} context: ${{ matrix.base_path }}/${{ matrix.project_name }}
file: ${{ matrix.base_path }}/${{ matrix.project_name }}/Dockerfile file: ${{ matrix.base_path }}/${{ matrix.project_name }}/Dockerfile
platforms: linux/amd64 platforms: |
linux/amd64,
linux/arm/v7,
linux/arm64/v8
push: true push: true
tags: ${{ steps.image-name.outputs.name }} tags: ${{ steps.image-name.outputs.name }}
secrets: | secrets: |
"GH_PAT=${{ steps.retrieve-secret-pat.outputs.github-pat-bitwarden-devops-bot-repo-scope }}" "GH_PAT=${{ steps.retrieve-secret-pat.outputs.github-pat-bitwarden-devops-bot-repo-scope }}"
- name: Log out of Docker
run: docker logout
upload: upload:
name: Upload name: Upload
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
needs: build-docker needs: build-docker
steps: steps:
- name: Checkout repo - name: Checkout repo
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Set up dotnet - name: Set up dotnet
uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0 uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0
@ -348,7 +338,7 @@ jobs:
creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }} creds: ${{ secrets.AZURE_PROD_KV_CREDENTIALS }}
- name: Login to PROD ACR - name: Login to PROD ACR
run: az acr login -n $_AZ_REGISTRY --only-show-errors run: az acr login -n ${_AZ_REGISTRY%.azurecr.io}
- name: Restore - name: Restore
run: dotnet tool restore run: dotnet tool restore
@ -518,8 +508,7 @@ jobs:
self-host-build: self-host-build:
name: Trigger self-host build name: Trigger self-host build
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
needs: needs: build-docker
- build-docker
steps: steps:
- name: Login to Azure - CI Subscription - name: Login to Azure - CI Subscription
uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.7 uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.7

52
src/Admin/Dockerfile
View File

@ -1,17 +1,59 @@
FROM mcr.microsoft.com/dotnet/aspnet:6.0 FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/aspnet:6.0 AS dotnet-build
# Docker buildx supplies the value for this arg
ARG TARGETPLATFORM
ENV NODE_VERSION=16
# 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
# Add packages
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh | bash
RUN npm install -g gulp
WORKDIR /source
COPY *.csproj .
COPY ../../Directory.Build.props .
# Restore Admin project dependencies and tools
RUN . /tmp/rid.txt && dotnet restore -r $RID
COPY . .
#COPY ../../.git/. ./.git/
# Build Admin app
RUN npm install
RUN gulp --gulpfile "gulpfile.js" build
RUN . /tmp/rid.txt && dotnet publish -c release -o /app/Admin --no-restore --no-self-contained -r $RID
###############################################
# App stage #
###############################################
FROM mcr.microsoft.com/dotnet/aspnet:6.0
ARG TARGETPLATFORM
LABEL com.bitwarden.product="bitwarden" LABEL com.bitwarden.product="bitwarden"
ENV ASPNETCORE_ENVIRONMENT=Production
ENV ASPNETCORE_URLS http://+:5000
EXPOSE 5000
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y --no-install-recommends \ && apt-get install -y --no-install-recommends \
gosu \
curl \ curl \
gosu \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
ENV ASPNETCORE_URLS http://+:5000 # Copy all apps from dotnet-build stage
WORKDIR /app WORKDIR /app
EXPOSE 5000 COPY --from=dotnet-build /app ./
COPY obj/build-output/publish .
COPY entrypoint.sh / COPY entrypoint.sh /
RUN chmod +x /entrypoint.sh RUN chmod +x /entrypoint.sh