diff --git a/bitwarden_license/src/Scim/.dockerignore b/bitwarden_license/src/Scim/.dockerignore deleted file mode 100644 index fc12f25146..0000000000 --- a/bitwarden_license/src/Scim/.dockerignore +++ /dev/null @@ -1,4 +0,0 @@ -* -!obj/build-output/publish/* -!obj/Docker/empty/ -!entrypoint.sh diff --git a/bitwarden_license/src/Scim/Dockerfile b/bitwarden_license/src/Scim/Dockerfile index 0c97fdcf49..a6823a46a3 100644 --- a/bitwarden_license/src/Scim/Dockerfile +++ b/bitwarden_license/src/Scim/Dockerfile @@ -26,7 +26,7 @@ COPY src/Infrastructure.EntityFramework/*.csproj ./src/Infrastructure.EntityFram COPY src/SharedWeb/*.csproj ./src/SharedWeb/ COPY Directory.Build.props . -# Restore Scim project dependencies and tools +# Restore project dependencies and tools WORKDIR /source/bitwarden_license/src/Scim 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 .git/. ./.git/ -# Build Scim app +# Build app WORKDIR /source/bitwarden_license/src/Scim RUN . /tmp/rid.txt && dotnet publish -c release -o /app/Scim --no-restore --no-self-contained -r $RID diff --git a/bitwarden_license/src/Sso/Dockerfile b/bitwarden_license/src/Sso/Dockerfile index 784647dee2..e53fdeb1af 100644 --- a/bitwarden_license/src/Sso/Dockerfile +++ b/bitwarden_license/src/Sso/Dockerfile @@ -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 PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH -# Install gulp -RUN npm install -g gulp - # Copy csproj files as distinct layers WORKDIR /source 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 Directory.Build.props . -# Restore Sso project dependencies and tools +# Restore project dependencies and tools WORKDIR /source/bitwarden_license/src/Sso 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 .git/. ./.git/ -# Build Sso app +# Build app WORKDIR /source/bitwarden_license/src/Sso -RUN npm install -RUN gulp --gulpfile "gulpfile.js" build +RUN npm ci +RUN npm run build RUN . /tmp/rid.txt && dotnet publish -c release -o /app/Sso --no-restore --no-self-contained -r $RID WORKDIR /app diff --git a/src/Admin/.dockerignore b/src/Admin/.dockerignore deleted file mode 100644 index fc12f25146..0000000000 --- a/src/Admin/.dockerignore +++ /dev/null @@ -1,4 +0,0 @@ -* -!obj/build-output/publish/* -!obj/Docker/empty/ -!entrypoint.sh diff --git a/src/Admin/Dockerfile b/src/Admin/Dockerfile index 20930d774e..f9eeb172c9 100644 --- a/src/Admin/Dockerfile +++ b/src/Admin/Dockerfile @@ -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 PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH -# Install gulp -RUN npm install -g gulp - # Copy csproj files as distinct layers WORKDIR /source 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 Directory.Build.props . -# Restore Admin project dependencies and tools +# Restore project dependencies and tools WORKDIR /source/src/Admin 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 .git/. ./.git/ -# Build Admin app +# Build app WORKDIR /source/src/Admin -RUN npm install -RUN gulp --gulpfile "gulpfile.js" build +RUN npm ci +RUN npm run build RUN . /tmp/rid.txt && dotnet publish -c release -o /app/Admin --no-restore --no-self-contained -r $RID WORKDIR /app diff --git a/src/Api/.dockerignore b/src/Api/.dockerignore deleted file mode 100644 index fc12f25146..0000000000 --- a/src/Api/.dockerignore +++ /dev/null @@ -1,4 +0,0 @@ -* -!obj/build-output/publish/* -!obj/Docker/empty/ -!entrypoint.sh diff --git a/src/Api/Dockerfile b/src/Api/Dockerfile index 0f6e70ff86..728d1accd2 100644 --- a/src/Api/Dockerfile +++ b/src/Api/Dockerfile @@ -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 Directory.Build.props . -# Restore Api project dependencies and tools +# Restore project dependencies and tools WORKDIR /source/src/Api 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 .git/. ./.git/ -# Build Api app +# Build app WORKDIR /source/src/Api RUN . /tmp/rid.txt && dotnet publish -c release -o /app/Api --no-restore --no-self-contained -r $RID diff --git a/src/Billing/.dockerignore b/src/Billing/.dockerignore deleted file mode 100644 index fc12f25146..0000000000 --- a/src/Billing/.dockerignore +++ /dev/null @@ -1,4 +0,0 @@ -* -!obj/build-output/publish/* -!obj/Docker/empty/ -!entrypoint.sh diff --git a/src/Billing/Dockerfile b/src/Billing/Dockerfile index 58258f5730..9c17890bd8 100644 --- a/src/Billing/Dockerfile +++ b/src/Billing/Dockerfile @@ -26,7 +26,7 @@ COPY src/Infrastructure.EntityFramework/*.csproj ./src/Infrastructure.EntityFram COPY src/SharedWeb/*.csproj ./src/SharedWeb/ COPY Directory.Build.props . -# Restore Billing project dependencies and tools +# Restore project dependencies and tools WORKDIR /source/src/Billing 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 .git/. ./.git/ -# Build Billing app +# Build app WORKDIR /source/src/Billing RUN . /tmp/rid.txt && dotnet publish -c release -o /app/Billing --no-restore --no-self-contained -r $RID diff --git a/src/Events/.dockerignore b/src/Events/.dockerignore deleted file mode 100644 index fc12f25146..0000000000 --- a/src/Events/.dockerignore +++ /dev/null @@ -1,4 +0,0 @@ -* -!obj/build-output/publish/* -!obj/Docker/empty/ -!entrypoint.sh diff --git a/src/Events/Dockerfile b/src/Events/Dockerfile index 2833c860f9..88a0b06530 100644 --- a/src/Events/Dockerfile +++ b/src/Events/Dockerfile @@ -26,7 +26,7 @@ COPY src/Infrastructure.EntityFramework/*.csproj ./src/Infrastructure.EntityFram COPY src/SharedWeb/*.csproj ./src/SharedWeb/ COPY Directory.Build.props . -# Restore Events project dependencies and tools +# Restore project dependencies and tools WORKDIR /source/src/Events 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 .git/. ./.git/ -# Build Events app +# Build app WORKDIR /source/src/Events RUN . /tmp/rid.txt && dotnet publish -c release -o /app/Events --no-restore --no-self-contained -r $RID diff --git a/src/EventsProcessor/Dockerfile b/src/EventsProcessor/Dockerfile index 7b67dffb7f..28e1d72357 100644 --- a/src/EventsProcessor/Dockerfile +++ b/src/EventsProcessor/Dockerfile @@ -26,7 +26,7 @@ COPY src/Infrastructure.EntityFramework/*.csproj ./src/Infrastructure.EntityFram COPY src/SharedWeb/*.csproj ./src/SharedWeb/ COPY Directory.Build.props . -# Restore EventsProcessor project dependencies and tools +# Restore project dependencies and tools WORKDIR /source/src/EventsProcessor 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 .git/. ./.git/ -# Build EventsProcessor app +# Build app WORKDIR /source/src/EventsProcessor RUN . /tmp/rid.txt && dotnet publish -c release -o /app/EventsProcessor --no-restore --no-self-contained -r $RID diff --git a/src/Icons/.dockerignore b/src/Icons/.dockerignore deleted file mode 100644 index fc12f25146..0000000000 --- a/src/Icons/.dockerignore +++ /dev/null @@ -1,4 +0,0 @@ -* -!obj/build-output/publish/* -!obj/Docker/empty/ -!entrypoint.sh diff --git a/src/Icons/Dockerfile b/src/Icons/Dockerfile index 384f75410d..f4780fe779 100644 --- a/src/Icons/Dockerfile +++ b/src/Icons/Dockerfile @@ -26,7 +26,7 @@ COPY src/Infrastructure.EntityFramework/*.csproj ./src/Infrastructure.EntityFram COPY src/SharedWeb/*.csproj ./src/SharedWeb/ COPY Directory.Build.props . -# Restore Icons project dependencies and tools +# Restore project dependencies and tools WORKDIR /source/src/Icons 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 .git/. ./.git/ -# Build Icons app +# Build app WORKDIR /source/src/Icons RUN . /tmp/rid.txt && dotnet publish -c release -o /app/Icons --no-restore --no-self-contained -r $RID diff --git a/src/Identity/.dockerignore b/src/Identity/.dockerignore deleted file mode 100644 index fc12f25146..0000000000 --- a/src/Identity/.dockerignore +++ /dev/null @@ -1,4 +0,0 @@ -* -!obj/build-output/publish/* -!obj/Docker/empty/ -!entrypoint.sh diff --git a/src/Identity/Dockerfile b/src/Identity/Dockerfile index cbcc32413e..cc2bc1618f 100644 --- a/src/Identity/Dockerfile +++ b/src/Identity/Dockerfile @@ -26,7 +26,7 @@ COPY src/Infrastructure.EntityFramework/*.csproj ./src/Infrastructure.EntityFram COPY src/SharedWeb/*.csproj ./src/SharedWeb/ COPY Directory.Build.props . -# Restore Identity project dependencies and tools +# Restore project dependencies and tools WORKDIR /source/src/Identity 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 .git/. ./.git/ -# Build Identity app +# Build app WORKDIR /source/src/Identity RUN . /tmp/rid.txt && dotnet publish -c release -o /app/Identity --no-restore --no-self-contained -r $RID diff --git a/src/Notifications/.dockerignore b/src/Notifications/.dockerignore deleted file mode 100644 index fc12f25146..0000000000 --- a/src/Notifications/.dockerignore +++ /dev/null @@ -1,4 +0,0 @@ -* -!obj/build-output/publish/* -!obj/Docker/empty/ -!entrypoint.sh diff --git a/src/Notifications/Dockerfile b/src/Notifications/Dockerfile index b257fcb367..a13d3b4fd9 100644 --- a/src/Notifications/Dockerfile +++ b/src/Notifications/Dockerfile @@ -26,7 +26,7 @@ COPY src/Infrastructure.EntityFramework/*.csproj ./src/Infrastructure.EntityFram COPY src/SharedWeb/*.csproj ./src/SharedWeb/ COPY Directory.Build.props . -# Restore Notifications project dependencies and tools +# Restore project dependencies and tools WORKDIR /source/src/Notifications 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 .git/. ./.git/ -# Build Notifications app +# Build app WORKDIR /source/src/Notifications RUN . /tmp/rid.txt && dotnet publish -c release -o /app/Notifications --no-restore --no-self-contained -r $RID diff --git a/util/Attachments/.dockerignore b/util/Attachments/.dockerignore deleted file mode 100644 index 864179fda5..0000000000 --- a/util/Attachments/.dockerignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!entrypoint.sh diff --git a/util/Attachments/Dockerfile b/util/Attachments/Dockerfile index 4270972f71..407792b1af 100644 --- a/util/Attachments/Dockerfile +++ b/util/Attachments/Dockerfile @@ -22,7 +22,7 @@ WORKDIR /source COPY util/Server/*.csproj ./util/Server/ COPY Directory.Build.props . -# Restore Server project dependencies and tools +# Restore project dependencies and tools WORKDIR /source/util/Server RUN . /tmp/rid.txt && dotnet restore -r $RID @@ -31,7 +31,7 @@ WORKDIR /source COPY util/Server/. ./util/Server/ COPY .git/. ./.git/ -# Build Server app +# Build app WORKDIR /source/util/Server RUN . /tmp/rid.txt && dotnet publish -c release -o /app/Server --no-restore --no-self-contained -r $RID diff --git a/util/MsSqlMigratorUtility/.dockerignore b/util/MsSqlMigratorUtility/.dockerignore deleted file mode 100644 index 546b9afbef..0000000000 --- a/util/MsSqlMigratorUtility/.dockerignore +++ /dev/null @@ -1,3 +0,0 @@ -* -!obj/build-output/publish/* -!obj/Docker/empty/ diff --git a/util/MsSqlMigratorUtility/Dockerfile b/util/MsSqlMigratorUtility/Dockerfile index 69342ccfd2..f7c3917fc3 100644 --- a/util/MsSqlMigratorUtility/Dockerfile +++ b/util/MsSqlMigratorUtility/Dockerfile @@ -25,7 +25,7 @@ COPY util/Migrator/*.csproj ./util/Migrator/ COPY util/MsSqlMigratorUtility/*.csproj ./util/MsSqlMigratorUtility/ COPY Directory.Build.props . -# Restore MsSqlMigratorUtility project dependencies and tools +# Restore project dependencies and tools WORKDIR /source/util/MsSqlMigratorUtility RUN . /tmp/rid.txt && dotnet restore -r $RID @@ -36,7 +36,7 @@ COPY util/Migrator/. ./util/Migrator/ COPY util/MsSqlMigratorUtility/. ./util/MsSqlMigratorUtility/ COPY .git/. ./.git/ -# Build MsSqlMigratorUtility app +# Build app WORKDIR /source/util/MsSqlMigratorUtility RUN . /tmp/rid.txt && dotnet publish -c release -o /app/MsSqlMigratorUtility --no-restore --no-self-contained -r $RID diff --git a/util/Setup/.dockerignore b/util/Setup/.dockerignore deleted file mode 100644 index fc12f25146..0000000000 --- a/util/Setup/.dockerignore +++ /dev/null @@ -1,4 +0,0 @@ -* -!obj/build-output/publish/* -!obj/Docker/empty/ -!entrypoint.sh diff --git a/util/Setup/Dockerfile b/util/Setup/Dockerfile index dce42a14bb..0b91995f7b 100644 --- a/util/Setup/Dockerfile +++ b/util/Setup/Dockerfile @@ -24,7 +24,7 @@ COPY util/Migrator/*.csproj ./util/Migrator/ COPY util/Setup/*.csproj ./util/Setup/ COPY Directory.Build.props . -# Restore Setup project dependencies and tools +# Restore project dependencies and tools WORKDIR /source/util/Setup RUN . /tmp/rid.txt && dotnet restore -r $RID @@ -35,7 +35,7 @@ COPY util/Migrator/. ./util/Migrator/ COPY util/Setup/. ./util/Setup/ COPY .git/. ./.git/ -# Build Setup app +# Build app WORKDIR /source/util/Setup RUN . /tmp/rid.txt && dotnet publish -c release -o /app/Setup --no-restore --no-self-contained -r $RID