Skip to content

Commit fa53b54

Browse files
Copilotimnasnainaec
andcommitted
Fix merge conflict resolution - restore deleted environment and setup lines
Restored lines that were accidentally deleted during merge: - Dockerfile: WORKDIR, ENV variables (HOST_DIR, FRONTEND_HOST_DIR), and RUN mkdir commands - Backend/Dockerfile: ENV variables (ASPNETCORE_URLS, COMBINE_IS_IN_CONTAINER, ASPNETCORE_ENVIRONMENT, DOTNET_PRINT_TELEMETRY_MESSAGE, HOME) Co-authored-by: imnasnainaec <6411521+imnasnainaec@users.noreply.github.com>
1 parent e58238c commit fa53b54

File tree

2 files changed

+19
-0
lines changed

2 files changed

+19
-0
lines changed

Backend/Dockerfile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,14 @@ RUN dotnet publish -c Release -o build
2020

2121
# Build runtime image.
2222
FROM mcr.microsoft.com/dotnet/aspnet:8.0.21-jammy@sha256:f771a2d3a545a24e01685c4bda33d5f671ea3f31c4691bde036838c0efee025c
23+
24+
ENV ASPNETCORE_URLS=http://+:5000
25+
ENV COMBINE_IS_IN_CONTAINER=1
26+
ENV ASPNETCORE_ENVIRONMENT=Production
27+
ENV DOTNET_PRINT_TELEMETRY_MESSAGE=false
28+
29+
# Set the home directory to the app user's home.
30+
ENV HOME=/home/app
2331
ENV APP_HOME=${HOME}/backend
2432
ENV APP_FILES=${HOME}/.CombineFiles
2533

Dockerfile

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,17 @@ RUN npm run build
3838
# Production environment.
3939
FROM nginx:1.29.3@sha256:bd1578eec775d0b28fd7f664b182b7e1fb75f1dd09f92d865dababe8525dfe8b
4040

41+
WORKDIR /app
42+
43+
ENV HOST_DIR=/usr/share/nginx
44+
ENV FRONTEND_HOST_DIR=${HOST_DIR}/html
45+
46+
RUN mkdir /etc/nginx/templates
47+
RUN mkdir /etc/nginx/page_templates
48+
RUN mkdir ${HOST_DIR}/fonts
49+
RUN mkdir ${FRONTEND_HOST_DIR}/scripts
50+
RUN mkdir ${FRONTEND_HOST_DIR}/url_moved
51+
4152
# Setup web content
4253
COPY --from=user_guide_builder /app/docs/user_guide/site ${HOST_DIR}/user_guide
4354
COPY --from=frontend_builder /app/dist ${FRONTEND_HOST_DIR}

0 commit comments

Comments
 (0)