From b6322dd764c409426e5889208b8c0d1c8f4aec8f Mon Sep 17 00:00:00 2001 From: tangowithfoxtrot <5676771+tangowithfoxtrot@users.noreply.github.com> Date: Tue, 6 May 2025 10:12:23 -0700 Subject: [PATCH] fix: try using .net core certificate handling --- bitwarden_license/src/Scim/Dockerfile | 1 + bitwarden_license/src/Sso/Dockerfile | 1 + src/Admin/Dockerfile | 3 +-- src/Api/Dockerfile | 1 + src/Billing/Dockerfile | 1 + src/Events/Dockerfile | 1 + src/EventsProcessor/Dockerfile | 1 + src/Icons/Dockerfile | 1 + src/Identity/Dockerfile | 1 + src/Notifications/Dockerfile | 1 + util/Attachments/Dockerfile | 1 + 11 files changed, 11 insertions(+), 2 deletions(-) diff --git a/bitwarden_license/src/Scim/Dockerfile b/bitwarden_license/src/Scim/Dockerfile index 87cfe9cca5..3560035596 100644 --- a/bitwarden_license/src/Scim/Dockerfile +++ b/bitwarden_license/src/Scim/Dockerfile @@ -65,6 +65,7 @@ ARG TARGETPLATFORM LABEL com.bitwarden.product="bitwarden" ENV ASPNETCORE_ENVIRONMENT=Production ENV ASPNETCORE_URLS=http://+:5000 +ENV SSL_CERT_DIR=/etc/bitwarden/ca-certificates EXPOSE 5000 RUN apt-get update \ diff --git a/bitwarden_license/src/Sso/Dockerfile b/bitwarden_license/src/Sso/Dockerfile index b5ff0dfab1..d75d1ca503 100644 --- a/bitwarden_license/src/Sso/Dockerfile +++ b/bitwarden_license/src/Sso/Dockerfile @@ -65,6 +65,7 @@ ARG TARGETPLATFORM LABEL com.bitwarden.product="bitwarden" ENV ASPNETCORE_ENVIRONMENT=Production ENV ASPNETCORE_URLS=http://+:5000 +ENV SSL_CERT_DIR=/etc/bitwarden/ca-certificates EXPOSE 5000 RUN apt-get update \ diff --git a/src/Admin/Dockerfile b/src/Admin/Dockerfile index f2810c6c81..8c74c19289 100644 --- a/src/Admin/Dockerfile +++ b/src/Admin/Dockerfile @@ -83,6 +83,7 @@ LABEL com.bitwarden.product="bitwarden" EXPOSE 5000 ENV ASPNETCORE_URLS=http://+:5000 +ENV SSL_CERT_DIR=/etc/bitwarden/ca-certificates RUN apt-get update \ && apt-get install -y --no-install-recommends \ @@ -90,8 +91,6 @@ RUN apt-get update \ curl \ && rm -rf /var/lib/apt/lists/* -ENV ASPNETCORE_URLS=http://+:5000 - # Copy app from the build stage WORKDIR /app COPY --from=build /source/src/Admin/out /app diff --git a/src/Api/Dockerfile b/src/Api/Dockerfile index 6e3ab0e444..3a3aafbfcd 100644 --- a/src/Api/Dockerfile +++ b/src/Api/Dockerfile @@ -65,6 +65,7 @@ ARG TARGETPLATFORM LABEL com.bitwarden.product="bitwarden" ENV ASPNETCORE_ENVIRONMENT=Production ENV ASPNETCORE_URLS=http://+:5000 +ENV SSL_CERT_DIR=/etc/bitwarden/ca-certificates EXPOSE 5000 RUN apt-get update \ diff --git a/src/Billing/Dockerfile b/src/Billing/Dockerfile index d3e4939a44..1eef72733f 100644 --- a/src/Billing/Dockerfile +++ b/src/Billing/Dockerfile @@ -61,6 +61,7 @@ ARG TARGETPLATFORM LABEL com.bitwarden.product="bitwarden" ENV ASPNETCORE_ENVIRONMENT=Production ENV ASPNETCORE_URLS=http://+:5000 +ENV SSL_CERT_DIR=/etc/bitwarden/ca-certificates EXPOSE 5000 RUN apt-get update \ diff --git a/src/Events/Dockerfile b/src/Events/Dockerfile index 7fd406eeae..72d8e0a833 100644 --- a/src/Events/Dockerfile +++ b/src/Events/Dockerfile @@ -61,6 +61,7 @@ ARG TARGETPLATFORM LABEL com.bitwarden.product="bitwarden" ENV ASPNETCORE_ENVIRONMENT=Production ENV ASPNETCORE_URLS=http://+:5000 +ENV SSL_CERT_DIR=/etc/bitwarden/ca-certificates EXPOSE 5000 RUN apt-get update \ diff --git a/src/EventsProcessor/Dockerfile b/src/EventsProcessor/Dockerfile index 4e9c23ac11..5bb4fd34a2 100644 --- a/src/EventsProcessor/Dockerfile +++ b/src/EventsProcessor/Dockerfile @@ -62,6 +62,7 @@ ARG TARGETPLATFORM LABEL com.bitwarden.product="bitwarden" ENV ASPNETCORE_ENVIRONMENT=Production ENV ASPNETCORE_URLS=http://+:5000 +ENV SSL_CERT_DIR=/etc/bitwarden/ca-certificates EXPOSE 5000 RUN apt-get update \ diff --git a/src/Icons/Dockerfile b/src/Icons/Dockerfile index 8b78b8d1f6..eb844c6464 100644 --- a/src/Icons/Dockerfile +++ b/src/Icons/Dockerfile @@ -60,6 +60,7 @@ ARG TARGETPLATFORM LABEL com.bitwarden.product="bitwarden" ENV ASPNETCORE_ENVIRONMENT=Production ENV ASPNETCORE_URLS=http://+:5000 +ENV SSL_CERT_DIR=/etc/bitwarden/ca-certificates EXPOSE 5000 RUN apt-get update \ diff --git a/src/Identity/Dockerfile b/src/Identity/Dockerfile index e15c55671a..62439c8207 100644 --- a/src/Identity/Dockerfile +++ b/src/Identity/Dockerfile @@ -61,6 +61,7 @@ ARG TARGETPLATFORM LABEL com.bitwarden.product="bitwarden" ENV ASPNETCORE_ENVIRONMENT=Production ENV ASPNETCORE_URLS=http://+:5000 +ENV SSL_CERT_DIR=/etc/bitwarden/ca-certificates EXPOSE 5000 RUN apt-get update \ diff --git a/src/Notifications/Dockerfile b/src/Notifications/Dockerfile index e3d0327cee..8179e6be04 100644 --- a/src/Notifications/Dockerfile +++ b/src/Notifications/Dockerfile @@ -61,6 +61,7 @@ ARG TARGETPLATFORM LABEL com.bitwarden.product="bitwarden" ENV ASPNETCORE_ENVIRONMENT=Production ENV ASPNETCORE_URLS=http://+:5000 +ENV SSL_CERT_DIR=/etc/bitwarden/ca-certificates EXPOSE 5000 RUN apt-get update \ diff --git a/util/Attachments/Dockerfile b/util/Attachments/Dockerfile index 89a33e80af..4bdfc43e76 100644 --- a/util/Attachments/Dockerfile +++ b/util/Attachments/Dockerfile @@ -51,6 +51,7 @@ ARG TARGETPLATFORM LABEL com.bitwarden.product="bitwarden" ENV ASPNETCORE_ENVIRONMENT=Production ENV ASPNETCORE_URLS=http://+:5000 +ENV SSL_CERT_DIR=/etc/bitwarden/ca-certificates EXPOSE 5000 RUN apt-get update \