nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-05-25 13:24:50 -05:00
Code

Update comments in Dockerfiles

Browse Source
This commit is contained in:
Vince Grassia 2023-11-20 16:36:33 -05:00
parent 10c8790f25
commit eb5830ef11
No known key found for this signature in database
GPG Key ID: 9AD7505E8448CC08
13 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bitwarden_license/src/Scim/Dockerfile
View File

@ -39,7 +39,7 @@ COPY src/Infrastructure.EntityFramework/. ./src/Infrastructure.EntityFramework/
COPY src/SharedWeb/. ./src/SharedWeb/ COPY src/SharedWeb/. ./src/SharedWeb/
COPY .git/. ./.git/ COPY .git/. ./.git/
# Build app # Build project
WORKDIR /source/bitwarden_license/src/Scim WORKDIR /source/bitwarden_license/src/Scim
RUN . /tmp/rid.txt && dotnet publish -c release -o /app/Scim --no-restore --no-self-contained -r $RID RUN . /tmp/rid.txt && dotnet publish -c release -o /app/Scim --no-restore --no-self-contained -r $RID

2
bitwarden_license/src/Sso/Dockerfile
View File

@ -56,7 +56,7 @@ COPY src/Infrastructure.EntityFramework/. ./src/Infrastructure.EntityFramework/
COPY src/SharedWeb/. ./src/SharedWeb/ COPY src/SharedWeb/. ./src/SharedWeb/
COPY .git/. ./.git/ COPY .git/. ./.git/
# Build app # Build project
WORKDIR /source/bitwarden_license/src/Sso WORKDIR /source/bitwarden_license/src/Sso
RUN npm ci RUN npm ci
RUN npm run build RUN npm run build

17
src/Admin/Dockerfile
View File

@ -5,8 +5,6 @@ FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:6.0 AS build
# Docker buildx supplies the value for this arg # Docker buildx supplies the value for this arg
ARG TARGETPLATFORM ARG TARGETPLATFORM
ARG NODE_VERSION=16.20.2
ENV NVM_DIR /usr/local/nvm
# 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.
@ -25,6 +23,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Set up Node # Set up Node
ARG NODE_VERSION=16.20.2
ENV NVM_DIR /usr/local/nvm
RUN mkdir -p $NVM_DIR RUN mkdir -p $NVM_DIR
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh | bash \ RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh | bash \
&& . $NVM_DIR/nvm.sh \ && . $NVM_DIR/nvm.sh \
@ -51,6 +51,7 @@ COPY Directory.Build.props .
# Restore project dependencies and tools # Restore project dependencies and tools
WORKDIR /source/src/Admin WORKDIR /source/src/Admin
RUN npm ci
RUN . /tmp/rid.txt && dotnet restore -r $RID RUN . /tmp/rid.txt && dotnet restore -r $RID
# Copy required project files # Copy required project files
@ -69,9 +70,8 @@ COPY bitwarden_license/src/Commercial.Core/. ./bitwarden_license/src/Commercial.
COPY bitwarden_license/src/Commercial.Infrastructure.EntityFramework/. ./bitwarden_license/src/Commercial.Infrastructure.EntityFramework/ COPY bitwarden_license/src/Commercial.Infrastructure.EntityFramework/. ./bitwarden_license/src/Commercial.Infrastructure.EntityFramework/
COPY .git/. ./.git/ COPY .git/. ./.git/
# Build app # Build project
WORKDIR /source/src/Admin WORKDIR /source/src/Admin
RUN npm ci
RUN npm run build RUN npm run build
RUN . /tmp/rid.txt && dotnet publish -c release -o /app/Admin --no-restore --no-self-contained -r $RID RUN . /tmp/rid.txt && dotnet publish -c release -o /app/Admin --no-restore --no-self-contained -r $RID
@ -88,17 +88,18 @@ ENV ASPNETCORE_ENVIRONMENT=Production
ENV ASPNETCORE_URLS http://+:5000 ENV ASPNETCORE_URLS http://+:5000
EXPOSE 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 \ gosu \
curl \ curl \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Copy image entrypoint
COPY src/Admin/entrypoint.sh /
RUN chmod +x /entrypoint.sh
# Copy app from the build stage # Copy app from the build stage
WORKDIR /app WORKDIR /app
COPY --from=build /app/Admin ./ COPY --from=build /app/Admin ./
COPY src/Admin/entrypoint.sh /
RUN chmod +x /entrypoint.sh
HEALTHCHECK CMD curl -f http://localhost:5000 || exit 1 HEALTHCHECK CMD curl -f http://localhost:5000 || exit 1

2
src/Api/Dockerfile
View File

@ -43,7 +43,7 @@ COPY bitwarden_license/src/Commercial.Core/. ./bitwarden_license/src/Commercial.
COPY bitwarden_license/src/Commercial.Infrastructure.EntityFramework/. ./bitwarden_license/src/Commercial.Infrastructure.EntityFramework/ COPY bitwarden_license/src/Commercial.Infrastructure.EntityFramework/. ./bitwarden_license/src/Commercial.Infrastructure.EntityFramework/
COPY .git/. ./.git/ COPY .git/. ./.git/
# Build app # Build project
WORKDIR /source/src/Api WORKDIR /source/src/Api
RUN . /tmp/rid.txt && dotnet publish -c release -o /app/Api --no-restore --no-self-contained -r $RID RUN . /tmp/rid.txt && dotnet publish -c release -o /app/Api --no-restore --no-self-contained -r $RID

2
src/Billing/Dockerfile
View File

@ -39,7 +39,7 @@ COPY src/Infrastructure.EntityFramework/. ./src/Infrastructure.EntityFramework/
COPY src/SharedWeb/. ./src/SharedWeb/ COPY src/SharedWeb/. ./src/SharedWeb/
COPY .git/. ./.git/ COPY .git/. ./.git/
# Build app # Build project
WORKDIR /source/src/Billing WORKDIR /source/src/Billing
RUN . /tmp/rid.txt && dotnet publish -c release -o /app/Billing --no-restore --no-self-contained -r $RID RUN . /tmp/rid.txt && dotnet publish -c release -o /app/Billing --no-restore --no-self-contained -r $RID

2
src/Events/Dockerfile
View File

@ -39,7 +39,7 @@ COPY src/Infrastructure.EntityFramework/. ./src/Infrastructure.EntityFramework/
COPY src/SharedWeb/. ./src/SharedWeb/ COPY src/SharedWeb/. ./src/SharedWeb/
COPY .git/. ./.git/ COPY .git/. ./.git/
# Build app # Build project
WORKDIR /source/src/Events WORKDIR /source/src/Events
RUN . /tmp/rid.txt && dotnet publish -c release -o /app/Events --no-restore --no-self-contained -r $RID RUN . /tmp/rid.txt && dotnet publish -c release -o /app/Events --no-restore --no-self-contained -r $RID

2
src/EventsProcessor/Dockerfile
View File

@ -39,7 +39,7 @@ COPY src/Infrastructure.EntityFramework/. ./src/Infrastructure.EntityFramework/
COPY src/SharedWeb/. ./src/SharedWeb/ COPY src/SharedWeb/. ./src/SharedWeb/
COPY .git/. ./.git/ COPY .git/. ./.git/
# Build app # Build project
WORKDIR /source/src/EventsProcessor WORKDIR /source/src/EventsProcessor
RUN . /tmp/rid.txt && dotnet publish -c release -o /app/EventsProcessor --no-restore --no-self-contained -r $RID RUN . /tmp/rid.txt && dotnet publish -c release -o /app/EventsProcessor --no-restore --no-self-contained -r $RID

2
src/Icons/Dockerfile
View File

@ -39,7 +39,7 @@ COPY src/Infrastructure.EntityFramework/. ./src/Infrastructure.EntityFramework/
COPY src/SharedWeb/. ./src/SharedWeb/ COPY src/SharedWeb/. ./src/SharedWeb/
COPY .git/. ./.git/ COPY .git/. ./.git/
# Build app # Build project
WORKDIR /source/src/Icons WORKDIR /source/src/Icons
RUN . /tmp/rid.txt && dotnet publish -c release -o /app/Icons --no-restore --no-self-contained -r $RID RUN . /tmp/rid.txt && dotnet publish -c release -o /app/Icons --no-restore --no-self-contained -r $RID

2
src/Identity/Dockerfile
View File

@ -39,7 +39,7 @@ COPY src/Infrastructure.EntityFramework/. ./src/Infrastructure.EntityFramework/
COPY src/SharedWeb/. ./src/SharedWeb/ COPY src/SharedWeb/. ./src/SharedWeb/
COPY .git/. ./.git/ COPY .git/. ./.git/
# Build app # Build project
WORKDIR /source/src/Identity WORKDIR /source/src/Identity
RUN . /tmp/rid.txt && dotnet publish -c release -o /app/Identity --no-restore --no-self-contained -r $RID RUN . /tmp/rid.txt && dotnet publish -c release -o /app/Identity --no-restore --no-self-contained -r $RID

2
src/Notifications/Dockerfile
View File

@ -39,7 +39,7 @@ COPY src/Infrastructure.EntityFramework/. ./src/Infrastructure.EntityFramework/
COPY src/SharedWeb/. ./src/SharedWeb/ COPY src/SharedWeb/. ./src/SharedWeb/
COPY .git/. ./.git/ COPY .git/. ./.git/
# Build app # Build project
WORKDIR /source/src/Notifications WORKDIR /source/src/Notifications
RUN . /tmp/rid.txt && dotnet publish -c release -o /app/Notifications --no-restore --no-self-contained -r $RID RUN . /tmp/rid.txt && dotnet publish -c release -o /app/Notifications --no-restore --no-self-contained -r $RID

2
util/Attachments/Dockerfile
View File

@ -31,7 +31,7 @@ WORKDIR /source
COPY util/Server/. ./util/Server/ COPY util/Server/. ./util/Server/
COPY .git/. ./.git/ COPY .git/. ./.git/
# Build app # Build project
WORKDIR /source/util/Server WORKDIR /source/util/Server
RUN . /tmp/rid.txt && dotnet publish -c release -o /app/Server --no-restore --no-self-contained -r $RID RUN . /tmp/rid.txt && dotnet publish -c release -o /app/Server --no-restore --no-self-contained -r $RID

2
util/MsSqlMigratorUtility/Dockerfile
View File

@ -36,7 +36,7 @@ COPY util/Migrator/. ./util/Migrator/
COPY util/MsSqlMigratorUtility/. ./util/MsSqlMigratorUtility/ COPY util/MsSqlMigratorUtility/. ./util/MsSqlMigratorUtility/
COPY .git/. ./.git/ COPY .git/. ./.git/
# Build app # Build project
WORKDIR /source/util/MsSqlMigratorUtility WORKDIR /source/util/MsSqlMigratorUtility
RUN . /tmp/rid.txt && dotnet publish -c release -o /app/MsSqlMigratorUtility --no-restore --no-self-contained -r $RID RUN . /tmp/rid.txt && dotnet publish -c release -o /app/MsSqlMigratorUtility --no-restore --no-self-contained -r $RID

2
util/Setup/Dockerfile
View File

@ -35,7 +35,7 @@ COPY util/Migrator/. ./util/Migrator/
COPY util/Setup/. ./util/Setup/ COPY util/Setup/. ./util/Setup/
COPY .git/. ./.git/ COPY .git/. ./.git/
# Build app # Build project
WORKDIR /source/util/Setup WORKDIR /source/util/Setup
RUN . /tmp/rid.txt && dotnet publish -c release -o /app/Setup --no-restore --no-self-contained -r $RID RUN . /tmp/rid.txt && dotnet publish -c release -o /app/Setup --no-restore --no-self-contained -r $RID