Skip to content

Commit 0722e36

Browse files
committed
Use chiseled docker image
1 parent 775471a commit 0722e36

3 files changed

Lines changed: 13 additions & 15 deletions

File tree

Dockerfile

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:10.0-alpine3.23@sha256:732cd42c6f659814c9804ad7b05c7f761e83ef8379c5b2fdc3af673353caff73 AS build
1+
FROM mcr.microsoft.com/dotnet/sdk:10.0-noble-amd64@sha256:69ff714a42f7931475acfcd2792d69cd4a656e4f3653d520e25c0fbe3c6d0cba AS build
22
WORKDIR /source
33

4-
# Install pre-reqs for SASS compilation
5-
RUN apk add --no-cache gcompat
6-
74
COPY . ./
85
RUN dotnet tool restore
96
RUN dotnet restore
@@ -18,12 +15,9 @@ COPY --from=build /source/src/TeachingRecordSystem.SupportUi/bin/Release/net10.0
1815
COPY --from=build /source/src/TeachingRecordSystem.Worker/bin/Release/net10.0/publish/ ./Worker/
1916
COPY --from=build /source/src/TeachingRecordSystem.AuthorizeAccess/bin/Release/net10.0/publish/ ./AuthorizeAccess/
2017

21-
# Fix for invoking trscli
22-
#RUN apk --no-cache add libc6-compat
23-
2418
ENV SENTRY_RELEASE=${GIT_SHA}
2519
ENV GIT_SHA=${GIT_SHA}
2620
ENV ASPNETCORE_HTTP_PORTS=3000
2721
ENV PATH="${PATH}:/Apps/TrsCli"
2822

29-
USER app
23+
USER $APP_UID

global_config/dev.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ CONFIG=dev
22
CONFIG_SHORT=dv
33
AZURE_SUBSCRIPTION=s189-teacher-services-cloud-test
44
AZURE_RESOURCE_PREFIX=s189t01
5-
TERRAFORM_MODULES_TAG=main
5+
TERRAFORM_MODULES_TAG=chiseled-dotnet

terraform/aks/app.tf

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ module "migrations" {
2323
environment = local.app_name_suffix
2424
service_name = var.service_name
2525
docker_image = var.docker_image
26-
commands = ["trscli"]
27-
arguments = ["migrate-db", "--connection-string", "$(CONNECTION_STRING)"]
26+
commands = ["dotnet"]
27+
arguments = ["/Apps/TrsCli/trscli.dll", "migrate-db", "--connection-string", "$(CONNECTION_STRING)"]
2828
job_name = "migrations"
2929
enable_logit = var.enable_logit
3030

@@ -66,7 +66,8 @@ module "api_application" {
6666
kubernetes_secret_name = module.api_application_configuration.kubernetes_secret_name
6767

6868
docker_image = var.docker_image
69-
command = ["/bin/ash", "-c", "cd /Apps/Api/; dotnet TeachingRecordSystem.Api.dll;"]
69+
command = ["dotnet", "TeachingRecordSystem.Api.dll"]
70+
working_dir = "/Apps/Api"
7071
web_port = 3000
7172
probe_path = "/health"
7273
replicas = var.api_replicas
@@ -109,7 +110,8 @@ module "authz_application" {
109110
kubernetes_secret_name = module.authz_application_configuration.kubernetes_secret_name
110111

111112
docker_image = var.docker_image
112-
command = ["/bin/ash", "-c", "cd /Apps/AuthorizeAccess/; dotnet TeachingRecordSystem.AuthorizeAccess.dll;"]
113+
command = ["dotnet", "TeachingRecordSystem.AuthorizeAccess.dll"]
114+
working_dir = "/Apps/AuthorizeAccess"
113115
web_port = 3000
114116
probe_path = "/health"
115117
replicas = var.authz_replicas
@@ -152,7 +154,8 @@ module "ui_application" {
152154
kubernetes_secret_name = module.ui_application_configuration.kubernetes_secret_name
153155

154156
docker_image = var.docker_image
155-
command = ["/bin/ash", "-c", "cd /Apps/SupportUi/; dotnet TeachingRecordSystem.SupportUi.dll;"]
157+
command = ["dotnet", "TeachingRecordSystem.SupportUi.dll"]
158+
working_dir = "/Apps/SupportUi"
156159
web_port = 3000
157160
probe_path = "/health"
158161
replicas = var.ui_replicas
@@ -197,7 +200,8 @@ module "worker_application" {
197200
kubernetes_secret_name = module.worker_application_configuration.kubernetes_secret_name
198201

199202
docker_image = var.docker_image
200-
command = ["/bin/ash", "-c", "cd /Apps/Worker/; dotnet TeachingRecordSystem.Worker.dll;"]
203+
command = ["dotnet", "TeachingRecordSystem.Worker.dll"]
204+
working_dir = "/Apps/Worker"
201205
replicas = var.worker_replicas
202206
max_memory = var.worker_max_memory
203207
enable_logit = var.enable_logit

0 commit comments

Comments
 (0)