Skip to content

Commit 81f7167

Browse files
ucswiftucswift
committed
RE1-T119 PR#380 fixes
1 parent cfe98de commit 81f7167

7 files changed

Lines changed: 15 additions & 39 deletions

File tree

‎Repositories/Resgrid.Repositories.DataRepository/Dockerfile‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎Web/Resgrid.Web.Eventing/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
ARG BUILD_VERSION=3.5.0
33

44
#FROM mcr.microsoft.com/dotnet/runtime:9.0.3-noble-amd64 AS base
5-
FROM dhi.io/dotnet:9.0.16-debian13 AS base
5+
FROM dhi.io/dotnet:9.0.16-debian13@sha256:4797903e46b475875f4a402aa6f42a1dcc78cfe67d217f9f5f49e358b60d47a3 AS base
66
ARG BUILD_VERSION
77
WORKDIR /app
88
EXPOSE 80
99

1010
#FROM mcr.microsoft.com/dotnet/sdk:9.0.202-noble-amd64 AS build
11-
FROM dhi.io/dotnet:9.0.314-sdk-debian13 AS build
11+
FROM dhi.io/dotnet:9.0.314-sdk-debian13@sha256:a3acd51de0af79878e26292b3053aab513c6ca4476ddb2f9f11adb9c04aa7c89 AS build
1212
ARG BUILD_VERSION
1313
WORKDIR /src
1414
COPY ["Web/Resgrid.Web.Eventing/Resgrid.Web.Eventing.csproj", "Web/Resgrid.Web.Eventing/"]

‎Web/Resgrid.Web.Mcp/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
ARG BUILD_VERSION=3.5.0
44

55
#FROM mcr.microsoft.com/dotnet/runtime:9.0.3-noble-amd64 AS base
6-
FROM dhi.io/dotnet:9.0.16-debian13 AS base
6+
FROM dhi.io/dotnet:9.0.16-debian13@sha256:4797903e46b475875f4a402aa6f42a1dcc78cfe67d217f9f5f49e358b60d47a3 AS base
77
ARG BUILD_VERSION
88
WORKDIR /app
99
EXPOSE 8080
1010

1111
#FROM mcr.microsoft.com/dotnet/sdk:9.0.202-noble-amd64 AS build
12-
FROM dhi.io/dotnet:9.0.314-sdk-debian13 AS build
12+
FROM dhi.io/dotnet:9.0.314-sdk-debian13@sha256:a3acd51de0af79878e26292b3053aab513c6ca4476ddb2f9f11adb9c04aa7c89 AS build
1313
ARG BUILD_VERSION
1414
WORKDIR /src
1515
COPY ["Web/Resgrid.Web.Mcp/Resgrid.Web.Mcp.csproj", "Web/Resgrid.Web.Mcp/"]

‎Web/Resgrid.Web.Services/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
ARG BUILD_VERSION=3.5.0
44

55
#FROM mcr.microsoft.com/dotnet/runtime:9.0.3-noble-amd64 AS base
6-
FROM dhi.io/dotnet:9.0.16-debian13 AS base
6+
FROM dhi.io/dotnet:9.0.16-debian13@sha256:4797903e46b475875f4a402aa6f42a1dcc78cfe67d217f9f5f49e358b60d47a3 AS base
77
ARG BUILD_VERSION
88
WORKDIR /app
99
EXPOSE 80
1010

1111
#FROM mcr.microsoft.com/dotnet/sdk:9.0.202-noble-amd64 AS build
12-
FROM dhi.io/dotnet:9.0.314-sdk-debian13 AS build
12+
FROM dhi.io/dotnet:9.0.314-sdk-debian13@sha256:a3acd51de0af79878e26292b3053aab513c6ca4476ddb2f9f11adb9c04aa7c89 AS build
1313
ARG BUILD_VERSION
1414
WORKDIR /src
1515
COPY ["Web/Resgrid.Web.Services/Resgrid.Web.Services.csproj", "Web/Resgrid.Web.Services/"]

‎Web/Resgrid.Web.Tts/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
ARG BUILD_VERSION=3.5.0
22

33
#FROM mcr.microsoft.com/dotnet/runtime:9.0.3-noble-amd64 AS base
4-
FROM dhi.io/dotnet:9.0.16-debian13 AS base
4+
FROM dhi.io/dotnet:9.0.16-debian13@sha256:4797903e46b475875f4a402aa6f42a1dcc78cfe67d217f9f5f49e358b60d47a3 AS base
55
ARG BUILD_VERSION
66
WORKDIR /app
77
EXPOSE 8080
88

99
#FROM mcr.microsoft.com/dotnet/sdk:9.0.202-noble-amd64 AS build
10-
FROM dhi.io/dotnet:9.0.314-sdk-debian13 AS build
10+
FROM dhi.io/dotnet:9.0.314-sdk-debian13@sha256:a3acd51de0af79878e26292b3053aab513c6ca4476ddb2f9f11adb9c04aa7c89 AS build
1111
ARG BUILD_VERSION
1212
WORKDIR /src
1313

‎Web/Resgrid.Web/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
ARG BUILD_VERSION=3.5.0
33

44
#FROM mcr.microsoft.com/dotnet/aspnet:9.0.3-noble-amd64 AS base
5-
FROM dhi.io/aspnetcore:9.0.16-debian13 AS base
5+
FROM dhi.io/aspnetcore:9.0.16-debian13@sha256:961647e80202ce33fc06472dda4e7ae2d2bc56d819aee6742602f70047b13dc7 AS base
66
ARG BUILD_VERSION
77
WORKDIR /app
88
EXPOSE 80
99

1010
#FROM node:18.19-alpine3.19 AS node_base
1111
#FROM mcr.microsoft.com/dotnet/sdk:9.0.202-noble-amd64 AS build
12-
FROM dhi.io/dotnet:9.0.314-sdk-debian13 AS build
12+
FROM dhi.io/dotnet:9.0.314-sdk-debian13@sha256:a3acd51de0af79878e26292b3053aab513c6ca4476ddb2f9f11adb9c04aa7c89 AS build
1313
#RUN apt-get update && apt-get install nodejs
1414
#COPY --from=node_base . .
1515
#COPY --from=node_base /usr/lib /usr/lib

‎Workers/Resgrid.Workers.Console/Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
ARG BUILD_VERSION=3.5.0
33

44
#FROM mcr.microsoft.com/dotnet/runtime:9.0.3-noble-amd64 AS base
5-
FROM dhi.io/dotnet:9.0.16-debian13 AS base
5+
FROM dhi.io/dotnet:9.0.16-debian13@sha256:4797903e46b475875f4a402aa6f42a1dcc78cfe67d217f9f5f49e358b60d47a3 AS base
66
ARG BUILD_VERSION
77
WORKDIR /app
88

99
#FROM mcr.microsoft.com/dotnet/sdk:9.0.202-noble-amd64 AS build
10-
FROM dhi.io/dotnet:9.0.314-sdk-debian13 AS build
10+
FROM dhi.io/dotnet:9.0.314-sdk-debian13@sha256:a3acd51de0af79878e26292b3053aab513c6ca4476ddb2f9f11adb9c04aa7c89 AS build
1111
ARG BUILD_VERSION
1212
WORKDIR /src
1313

@@ -45,7 +45,7 @@ FROM base AS final
4545
WORKDIR /app
4646

4747
## START - INSTALL WKHTMLTOPDF
48-
ENV WKHTMLTOX wkhtmltox_0.12.6.1-3.jammy_amd64.deb
48+
ENV WKHTMLTOX wkhtmltox_0.12.6.1-3.bookworm_amd64.deb
4949
ENV BUILD_PACKAGES build-essential
5050
ENV MAIN_PACKAGES apt-transport-https wget libfontconfig1-dev libfreetype6-dev libjpeg-dev libpng-dev libssl-dev libx11-dev libxext-dev libxrender-dev xfonts-75dpi xfonts-base zlib1g-dev fontconfig
5151

@@ -54,15 +54,15 @@ RUN apt-get update && apt-get install -y $MAIN_PACKAGES
5454
RUN set -xe \
5555
&& apt-get update -qq \
5656
&& apt-get install --no-install-recommends -yq $BUILD_PACKAGES \
57-
&& wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-3/wkhtmltox_0.12.6.1-3.jammy_amd64.deb \
57+
&& wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-3/wkhtmltox_0.12.6.1-3.bookworm_amd64.deb \
5858
&& dpkg -i ${WKHTMLTOX} \
5959
&& apt-get remove -y $BUILD_PACKAGES \
6060
&& apt-get autoremove -y \
6161
&& apt-get clean \
6262
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
6363
&& rm -rf ${WKHTMLTOX} \
6464
&& truncate -s 0 /var/log/*log
65-
## END - INSTALL WKHTMLTPDF
65+
## END - INSTALL WKHTMLTOPDF
6666

6767
COPY --from=publish /app/publish .
6868

0 commit comments

Comments
 (0)