diff --git a/.github/workflows/elasticsearch-docker-7.yml b/.github/workflows/elasticsearch-docker-7.yml index d6322709df..8fba79bf00 100644 --- a/.github/workflows/elasticsearch-docker-7.yml +++ b/.github/workflows/elasticsearch-docker-7.yml @@ -19,7 +19,7 @@ jobs: uses: actions/setup-dotnet@v4 with: dotnet-version: 9.0.* - #dotnet-quality: preview + dotnet-quality: preview - name: Build Reason env: GITHUB_EVENT: ${{ toJson(github) }} diff --git a/Dockerfile b/Dockerfile index 6a12d520e2..f2f5dcc843 100644 --- a/Dockerfile +++ b/Dockerfile @@ -50,7 +50,7 @@ FROM build AS api-publish WORKDIR /app/src/Exceptionless.Web RUN apt-get update -yq -RUN curl -sL https://deb.nodesource.com/setup_18.x | bash - && apt-get install -yq nodejs +RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - && apt-get install -yq nodejs RUN dotnet publish -c Release -o out /p:SkipSpaPublish=true @@ -70,7 +70,7 @@ FROM build AS app-publish WORKDIR /app/src/Exceptionless.Web RUN apt-get update -yq -RUN curl -sL https://deb.nodesource.com/setup_18.x | bash - && apt-get install -yq nodejs +RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - && apt-get install -yq nodejs RUN dotnet publish -c Release -o out diff --git a/src/Exceptionless.Web/ClientApp.angular/grunt/task-configs/connect.js b/src/Exceptionless.Web/ClientApp.angular/grunt/task-configs/connect.js index b0929795be..8000e545d6 100644 --- a/src/Exceptionless.Web/ClientApp.angular/grunt/task-configs/connect.js +++ b/src/Exceptionless.Web/ClientApp.angular/grunt/task-configs/connect.js @@ -5,8 +5,8 @@ var s = require("child_process"); var proxyRequest = require("grunt-connect-proxy2/lib/utils").proxyRequest; module.exports = function () { - var certs = generateCerts(); var target = getTarget(); + var certs = target.ssl ? generateCerts() : { cert: undefined, key: undefined }; return { main: { @@ -87,15 +87,6 @@ function getTarget() { /** Function taken from aspnetcore-https.js in ASP.NET React template https://github.com/microsoft/commercial-marketplace-offer-deploy/blob/main/src/ClientApp/ClientApp/aspnetcore-https.ts */ function generateCerts() { - if (process.env.CI) { - // eslint-disable-next-line no-console - console.warn("Skipping certificate generation in CI environment."); - return { - cert: undefined, - key: undefined, - }; - } - var baseFolder = process.env.APPDATA !== undefined && process.env.APPDATA !== "" ? `${process.env.APPDATA}/ASP.NET/https`