Skip to content

Commit e0e8d2b

Browse files
authored
Merge pull request #21 from Programeerik/added-csp-removed-inline-style
Alle dockerfiles en contexts nu gefixt voor GH actions
2 parents 01a3ac3 + 9c7274c commit e0e8d2b

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.github/workflows/azure-container-webapp.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ jobs:
6262
- name: Build and push container image to registry
6363
uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
6464
with:
65+
context: ./ShowcaseProject
6566
push: true
6667
tags: ghcr.io/${{ env.REPO }}:${{ github.sha }}
6768
file: ./ShowcaseProject/ShowcaseFrontend/Dockerfile

.github/workflows/docker-build-frontend.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ jobs:
1111
- uses: actions/checkout@v4
1212

1313
- name: Build the Frontend Docker image
14-
run: docker build ShowcaseProject --file ShowcaseProject/ShowcaseFrontend/Dockerfile --tag my-image-name:$(date +%s)
14+
run: docker build --file ShowcaseProject/ShowcaseFrontend/Dockerfile --tag my-image-name:$(date +%s) ShowcaseProject

ShowcaseProject/ShowcaseFrontend/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@ WORKDIR /app/ShowcaseFrontend
66
CMD ["dotnet", "watch", "run", "--no-launch-profile", "--urls", "http://+:80"]
77

88
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
9-
WORKDIR /src
10-
COPY ShowcaseFrontend/ShowcaseFrontend.csproj ShowcaseFrontend/
11-
RUN dotnet restore ./ShowcaseFrontend/ShowcaseFrontend.csproj
12-
COPY ShowcaseFrontend/. ShowcaseFrontend/
139
WORKDIR /src/ShowcaseFrontend
10+
COPY ShowcaseFrontend/ShowcaseFrontend.csproj ./
11+
RUN dotnet restore
12+
COPY ShowcaseFrontend/. ./
1413
RUN dotnet publish -c Release -o /app/publish /p:UseAppHost=false
1514

1615
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS final

0 commit comments

Comments
 (0)