Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ci: Correct Sample.Dockerfile #6

Merged
merged 1 commit into from
Feb 6, 2024
Merged

ci: Correct Sample.Dockerfile #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions LoadShedding.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
docker-compose.sample.yaml = docker-compose.sample.yaml
docker-compose.yaml = docker-compose.yaml
deploy\docker\Dockerfile = deploy\docker\Dockerfile
Makefile = Makefile
deploy\docker\Sample.Dockerfile = deploy\docker\Sample.Dockerfile
docker\Sample.Dockerfile = docker\Sample.Dockerfile
EndProjectSection
EndProject
Global
Expand Down
23 changes: 2 additions & 21 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,7 @@
.PHONY: build unit-tests integration-tests performance-tests clean sample sample-clean
.PHONY: sample sample-clean

build:
@docker compose up --build --no-start

unit-tests: build
@docker compose up --abort-on-container-exit --exit-code-from unit-tests unit-tests

integration-tests: build
@docker compose up --abort-on-container-exit --exit-code-from integration-tests integration-tests

performance-tests: build
@docker compose up -d performance-tests-sample
@docker compose up -d performance-tests-sample-no-limiter

@docker compose up --abort-on-container-exit --exit-code-from performance-tests performance-tests

clean:
@docker compose down
@docker compose -f docker-compose.sample.yaml down

sample:
@docker compose -f docker-compose.sample.yaml up -d
@docker compose -f docker-compose.sample.yaml up --build -d

sample-clean:
@docker compose -f docker-compose.sample.yaml down
111 changes: 0 additions & 111 deletions deploy/docker/Dockerfile
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion docker-compose.sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ services:
- MongoConnectionString=mongodb://mongo:27017/loadshedding
build:
context: .
dockerfile: deploy/docker/Samples.Dockerfile
dockerfile: docker/Sample.Dockerfile
depends_on:
- mongo

Expand Down
44 changes: 0 additions & 44 deletions docker-compose.yaml
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions deploy/docker/Sample.Dockerfile → docker/Sample.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG FROM_REPO=mcr.microsoft.com/dotnet
ARG DOTNET_SDK_IMAGE=sdk:sdk:8.0-jammy
ARG ASPNET_RUNTIME_IMAGE=aspnet:aspnet:8.0-jammy
ARG DOTNET_SDK_IMAGE=sdk:8.0-jammy
ARG ASPNET_RUNTIME_IMAGE=aspnet:8.0-jammy
ARG RUNTIME_IDENTIFIER=linux-x64

FROM ${FROM_REPO}/${DOTNET_SDK_IMAGE} as sdk-image
Expand Down Expand Up @@ -48,4 +48,4 @@ WORKDIR /out
ENV ASPNETCORE_URLS=http://+:5261

COPY --from=publish /out .
ENTRYPOINT ["dotnet", "Samples.WebApi.dll"]
ENTRYPOINT ["dotnet", "Samples.WebApi.dll"]
Loading