diff --git a/aspnetcore/openshift/api/rahti2/Dockerfile b/aspnetcore/openshift/api/rahti2/Dockerfile index f967b438..15fc3742 100644 --- a/aspnetcore/openshift/api/rahti2/Dockerfile +++ b/aspnetcore/openshift/api/rahti2/Dockerfile @@ -22,6 +22,7 @@ RUN dotnet publish "Interface/Interface.csproj" -c Release -o out # Runtime image FROM mcr.microsoft.com/dotnet/aspnet:8.0 +ENV TZ=Europe/Helsinki WORKDIR /app COPY --from=build-env /build/out . EXPOSE 8080 diff --git a/aspnetcore/openshift/indexer/rahti2/Dockerfile b/aspnetcore/openshift/indexer/rahti2/Dockerfile index 4d63bb23..e4ebfcde 100644 --- a/aspnetcore/openshift/indexer/rahti2/Dockerfile +++ b/aspnetcore/openshift/indexer/rahti2/Dockerfile @@ -24,6 +24,7 @@ RUN dotnet publish "Indexer/Indexer.csproj" -c Release -o out # Runtime image FROM mcr.microsoft.com/dotnet/runtime:8.0 +ENV TZ=Europe/Helsinki WORKDIR /app COPY --from=build-env /build/out . ENTRYPOINT ["dotnet", "CSC.PublicApi.Indexer.dll"] \ No newline at end of file diff --git a/aspnetcore/src/Indexer/DatabasePreflightCheck.cs b/aspnetcore/src/Indexer/DatabasePreflightCheck.cs index c811e1d3..b058765d 100644 --- a/aspnetcore/src/Indexer/DatabasePreflightCheck.cs +++ b/aspnetcore/src/Indexer/DatabasePreflightCheck.cs @@ -36,6 +36,18 @@ public bool IsGood() bool isGood = true; if (_context != null && _logger != null) { + // Log OpenShift build information + var buildCommitHash = Environment.GetEnvironmentVariable("OPENSHIFT_BUILD_COMMIT"); + if (!string.IsNullOrEmpty(buildCommitHash)) + { + _logger.LogInformation(_logPrefix + "OPENSHIFT_BUILD_COMMIT: {CommitHash}", buildCommitHash); + } + var buildName = Environment.GetEnvironmentVariable("OPENSHIFT_BUILD_NAME"); + if (!string.IsNullOrEmpty(buildName)) + { + _logger.LogInformation(_logPrefix + "OPENSHIFT_BUILD_NAME: {BuildName}", buildName); + } + _logger.LogInformation(_logPrefix + "Check that required database tables contain data for indexing"); // Publication count diff --git a/aspnetcore/src/Interface/Program.cs b/aspnetcore/src/Interface/Program.cs index f2a5e6b6..a5327c68 100644 --- a/aspnetcore/src/Interface/Program.cs +++ b/aspnetcore/src/Interface/Program.cs @@ -31,6 +31,18 @@ .Configuration(builder.Configuration) .CreateLogger(); +// Log OpenShift build information +var buildCommitHash = Environment.GetEnvironmentVariable("OPENSHIFT_BUILD_COMMIT"); +if (!string.IsNullOrEmpty(buildCommitHash)) +{ + Log.Information("OPENSHIFT_BUILD_COMMIT: {CommitHash}", buildCommitHash); +} +var buildName = Environment.GetEnvironmentVariable("OPENSHIFT_BUILD_NAME"); +if (!string.IsNullOrEmpty(buildName)) +{ + Log.Information("OPENSHIFT_BUILD_NAME: {BuildName}", buildName); +} + builder.Services.AddDbContext(options => // options.UseSqlServer("name=dbconnectionstringvirta")); {