nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-05-30 07:44:50 -05:00
Code

Update comments in Dockerfiles

Browse Source
This commit is contained in:
Vince Grassia 2023-11-16 15:52:46 -05:00
parent 70e9124b6b
commit 10c8790f25
No known key found for this signature in database
GPG Key ID: 9AD7505E8448CC08
24 changed files with 30 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bitwarden_license/src/Scim/.dockerignore
View File

@ -1,4 +0,0 @@
*
!obj/build-output/publish/*
!obj/Docker/empty/
!entrypoint.sh

4
bitwarden_license/src/Scim/Dockerfile
View File

@ -26,7 +26,7 @@ COPY src/Infrastructure.EntityFramework/*.csproj ./src/Infrastructure.EntityFram
COPY src/SharedWeb/*.csproj ./src/SharedWeb/ COPY src/SharedWeb/*.csproj ./src/SharedWeb/
COPY Directory.Build.props . COPY Directory.Build.props .
# Restore Scim project dependencies and tools # Restore project dependencies and tools
WORKDIR /source/bitwarden_license/src/Scim WORKDIR /source/bitwarden_license/src/Scim
RUN . /tmp/rid.txt && dotnet restore -r $RID RUN . /tmp/rid.txt && dotnet restore -r $RID
@ -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 Scim app # Build app
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

11
bitwarden_license/src/Sso/Dockerfile
View File

@ -34,9 +34,6 @@ RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh | b
ENV NODE_PATH $NVM_DIR/versions/node/v$NODE_VERSION/lib/node_modules ENV NODE_PATH $NVM_DIR/versions/node/v$NODE_VERSION/lib/node_modules
ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH
# Install gulp
RUN npm install -g gulp
# Copy csproj files as distinct layers # Copy csproj files as distinct layers
WORKDIR /source WORKDIR /source
COPY bitwarden_license/src/Sso/*.csproj ./bitwarden_license/src/Sso/ COPY bitwarden_license/src/Sso/*.csproj ./bitwarden_license/src/Sso/
@ -46,7 +43,7 @@ COPY src/Infrastructure.EntityFramework/*.csproj ./src/Infrastructure.EntityFram
COPY src/SharedWeb/*.csproj ./src/SharedWeb/ COPY src/SharedWeb/*.csproj ./src/SharedWeb/
COPY Directory.Build.props . COPY Directory.Build.props .
# Restore Sso project dependencies and tools # Restore project dependencies and tools
WORKDIR /source/bitwarden_license/src/Sso WORKDIR /source/bitwarden_license/src/Sso
RUN . /tmp/rid.txt && dotnet restore -r $RID RUN . /tmp/rid.txt && dotnet restore -r $RID
@ -59,10 +56,10 @@ COPY src/Infrastructure.EntityFramework/. ./src/Infrastructure.EntityFramework/
COPY src/SharedWeb/. ./src/SharedWeb/ COPY src/SharedWeb/. ./src/SharedWeb/
COPY .git/. ./.git/ COPY .git/. ./.git/
# Build Sso app # Build app
WORKDIR /source/bitwarden_license/src/Sso WORKDIR /source/bitwarden_license/src/Sso
RUN npm install RUN npm ci
RUN gulp --gulpfile "gulpfile.js" build RUN npm run build
RUN . /tmp/rid.txt && dotnet publish -c release -o /app/Sso --no-restore --no-self-contained -r $RID RUN . /tmp/rid.txt && dotnet publish -c release -o /app/Sso --no-restore --no-self-contained -r $RID
WORKDIR /app WORKDIR /app

4
src/Admin/.dockerignore
View File

@ -1,4 +0,0 @@
*
!obj/build-output/publish/*
!obj/Docker/empty/
!entrypoint.sh

11
src/Admin/Dockerfile
View File

@ -34,9 +34,6 @@ RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh | b
ENV NODE_PATH $NVM_DIR/versions/node/v$NODE_VERSION/lib/node_modules ENV NODE_PATH $NVM_DIR/versions/node/v$NODE_VERSION/lib/node_modules
ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH
# Install gulp
RUN npm install -g gulp
# Copy csproj files as distinct layers # Copy csproj files as distinct layers
WORKDIR /source WORKDIR /source
COPY src/Admin/*.csproj ./src/Admin/ COPY src/Admin/*.csproj ./src/Admin/
@ -52,7 +49,7 @@ COPY bitwarden_license/src/Commercial.Core/*.csproj ./bitwarden_license/src/Comm
COPY bitwarden_license/src/Commercial.Infrastructure.EntityFramework/*.csproj ./bitwarden_license/src/Commercial.Infrastructure.EntityFramework/ COPY bitwarden_license/src/Commercial.Infrastructure.EntityFramework/*.csproj ./bitwarden_license/src/Commercial.Infrastructure.EntityFramework/
COPY Directory.Build.props . COPY Directory.Build.props .
# Restore Admin project dependencies and tools # Restore project dependencies and tools
WORKDIR /source/src/Admin WORKDIR /source/src/Admin
RUN . /tmp/rid.txt && dotnet restore -r $RID RUN . /tmp/rid.txt && dotnet restore -r $RID
@ -72,10 +69,10 @@ 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 Admin app # Build app
WORKDIR /source/src/Admin WORKDIR /source/src/Admin
RUN npm install RUN npm ci
RUN gulp --gulpfile "gulpfile.js" 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
WORKDIR /app WORKDIR /app

4
src/Api/.dockerignore
View File

@ -1,4 +0,0 @@
*
!obj/build-output/publish/*
!obj/Docker/empty/
!entrypoint.sh

4
src/Api/Dockerfile
View File

@ -28,7 +28,7 @@ COPY bitwarden_license/src/Commercial.Core/*.csproj ./bitwarden_license/src/Comm
COPY bitwarden_license/src/Commercial.Infrastructure.EntityFramework/*.csproj ./bitwarden_license/src/Commercial.Infrastructure.EntityFramework/ COPY bitwarden_license/src/Commercial.Infrastructure.EntityFramework/*.csproj ./bitwarden_license/src/Commercial.Infrastructure.EntityFramework/
COPY Directory.Build.props . COPY Directory.Build.props .
# Restore Api project dependencies and tools # Restore project dependencies and tools
WORKDIR /source/src/Api WORKDIR /source/src/Api
RUN . /tmp/rid.txt && dotnet restore -r $RID RUN . /tmp/rid.txt && dotnet restore -r $RID
@ -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 Api app # Build app
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

4
src/Billing/.dockerignore
View File

@ -1,4 +0,0 @@
*
!obj/build-output/publish/*
!obj/Docker/empty/
!entrypoint.sh

4
src/Billing/Dockerfile
View File

@ -26,7 +26,7 @@ COPY src/Infrastructure.EntityFramework/*.csproj ./src/Infrastructure.EntityFram
COPY src/SharedWeb/*.csproj ./src/SharedWeb/ COPY src/SharedWeb/*.csproj ./src/SharedWeb/
COPY Directory.Build.props . COPY Directory.Build.props .
# Restore Billing project dependencies and tools # Restore project dependencies and tools
WORKDIR /source/src/Billing WORKDIR /source/src/Billing
RUN . /tmp/rid.txt && dotnet restore -r $RID RUN . /tmp/rid.txt && dotnet restore -r $RID
@ -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 Billing app # Build app
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

4
src/Events/.dockerignore
View File

@ -1,4 +0,0 @@
*
!obj/build-output/publish/*
!obj/Docker/empty/
!entrypoint.sh

4
src/Events/Dockerfile
View File

@ -26,7 +26,7 @@ COPY src/Infrastructure.EntityFramework/*.csproj ./src/Infrastructure.EntityFram
COPY src/SharedWeb/*.csproj ./src/SharedWeb/ COPY src/SharedWeb/*.csproj ./src/SharedWeb/
COPY Directory.Build.props . COPY Directory.Build.props .
# Restore Events project dependencies and tools # Restore project dependencies and tools
WORKDIR /source/src/Events WORKDIR /source/src/Events
RUN . /tmp/rid.txt && dotnet restore -r $RID RUN . /tmp/rid.txt && dotnet restore -r $RID
@ -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 Events app # Build app
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

4
src/EventsProcessor/Dockerfile
View File

@ -26,7 +26,7 @@ COPY src/Infrastructure.EntityFramework/*.csproj ./src/Infrastructure.EntityFram
COPY src/SharedWeb/*.csproj ./src/SharedWeb/ COPY src/SharedWeb/*.csproj ./src/SharedWeb/
COPY Directory.Build.props . COPY Directory.Build.props .
# Restore EventsProcessor project dependencies and tools # Restore project dependencies and tools
WORKDIR /source/src/EventsProcessor WORKDIR /source/src/EventsProcessor
RUN . /tmp/rid.txt && dotnet restore -r $RID RUN . /tmp/rid.txt && dotnet restore -r $RID
@ -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 EventsProcessor app # Build app
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

4
src/Icons/.dockerignore
View File

@ -1,4 +0,0 @@
*
!obj/build-output/publish/*
!obj/Docker/empty/
!entrypoint.sh

4
src/Icons/Dockerfile
View File

@ -26,7 +26,7 @@ COPY src/Infrastructure.EntityFramework/*.csproj ./src/Infrastructure.EntityFram
COPY src/SharedWeb/*.csproj ./src/SharedWeb/ COPY src/SharedWeb/*.csproj ./src/SharedWeb/
COPY Directory.Build.props . COPY Directory.Build.props .
# Restore Icons project dependencies and tools # Restore project dependencies and tools
WORKDIR /source/src/Icons WORKDIR /source/src/Icons
RUN . /tmp/rid.txt && dotnet restore -r $RID RUN . /tmp/rid.txt && dotnet restore -r $RID
@ -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 Icons app # Build app
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

4
src/Identity/.dockerignore
View File

@ -1,4 +0,0 @@
*
!obj/build-output/publish/*
!obj/Docker/empty/
!entrypoint.sh

4
src/Identity/Dockerfile
View File

@ -26,7 +26,7 @@ COPY src/Infrastructure.EntityFramework/*.csproj ./src/Infrastructure.EntityFram
COPY src/SharedWeb/*.csproj ./src/SharedWeb/ COPY src/SharedWeb/*.csproj ./src/SharedWeb/
COPY Directory.Build.props . COPY Directory.Build.props .
# Restore Identity project dependencies and tools # Restore project dependencies and tools
WORKDIR /source/src/Identity WORKDIR /source/src/Identity
RUN . /tmp/rid.txt && dotnet restore -r $RID RUN . /tmp/rid.txt && dotnet restore -r $RID
@ -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 Identity app # Build app
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

4
src/Notifications/.dockerignore
View File

@ -1,4 +0,0 @@
*
!obj/build-output/publish/*
!obj/Docker/empty/
!entrypoint.sh

4
src/Notifications/Dockerfile
View File

@ -26,7 +26,7 @@ COPY src/Infrastructure.EntityFramework/*.csproj ./src/Infrastructure.EntityFram
COPY src/SharedWeb/*.csproj ./src/SharedWeb/ COPY src/SharedWeb/*.csproj ./src/SharedWeb/
COPY Directory.Build.props . COPY Directory.Build.props .
# Restore Notifications project dependencies and tools # Restore project dependencies and tools
WORKDIR /source/src/Notifications WORKDIR /source/src/Notifications
RUN . /tmp/rid.txt && dotnet restore -r $RID RUN . /tmp/rid.txt && dotnet restore -r $RID
@ -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 Notifications app # Build app
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/.dockerignore
View File

@ -1,2 +0,0 @@
*
!entrypoint.sh

4
util/Attachments/Dockerfile
View File

@ -22,7 +22,7 @@ WORKDIR /source
COPY util/Server/*.csproj ./util/Server/ COPY util/Server/*.csproj ./util/Server/
COPY Directory.Build.props . COPY Directory.Build.props .
# Restore Server project dependencies and tools # Restore project dependencies and tools
WORKDIR /source/util/Server WORKDIR /source/util/Server
RUN . /tmp/rid.txt && dotnet restore -r $RID RUN . /tmp/rid.txt && dotnet restore -r $RID
@ -31,7 +31,7 @@ WORKDIR /source
COPY util/Server/. ./util/Server/ COPY util/Server/. ./util/Server/
COPY .git/. ./.git/ COPY .git/. ./.git/
# Build Server app # Build app
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

3
util/MsSqlMigratorUtility/.dockerignore
View File

@ -1,3 +0,0 @@
*
!obj/build-output/publish/*
!obj/Docker/empty/

4
util/MsSqlMigratorUtility/Dockerfile
View File

@ -25,7 +25,7 @@ COPY util/Migrator/*.csproj ./util/Migrator/
COPY util/MsSqlMigratorUtility/*.csproj ./util/MsSqlMigratorUtility/ COPY util/MsSqlMigratorUtility/*.csproj ./util/MsSqlMigratorUtility/
COPY Directory.Build.props . COPY Directory.Build.props .
# Restore MsSqlMigratorUtility project dependencies and tools # Restore project dependencies and tools
WORKDIR /source/util/MsSqlMigratorUtility WORKDIR /source/util/MsSqlMigratorUtility
RUN . /tmp/rid.txt && dotnet restore -r $RID RUN . /tmp/rid.txt && dotnet restore -r $RID
@ -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 MsSqlMigratorUtility app # Build app
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

4
util/Setup/.dockerignore
View File

@ -1,4 +0,0 @@
*
!obj/build-output/publish/*
!obj/Docker/empty/
!entrypoint.sh

4
util/Setup/Dockerfile
View File

@ -24,7 +24,7 @@ COPY util/Migrator/*.csproj ./util/Migrator/
COPY util/Setup/*.csproj ./util/Setup/ COPY util/Setup/*.csproj ./util/Setup/
COPY Directory.Build.props . COPY Directory.Build.props .
# Restore Setup project dependencies and tools # Restore project dependencies and tools
WORKDIR /source/util/Setup WORKDIR /source/util/Setup
RUN . /tmp/rid.txt && dotnet restore -r $RID RUN . /tmp/rid.txt && dotnet restore -r $RID
@ -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 Setup app # Build app
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