diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 9e809153a..b3d24d441 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -39,7 +39,7 @@ jobs: run: dotnet build --configuration Release --no-restore /warnaserror - name: Spin Up Stack - run: docker-compose up -d + run: docker compose up -d - name: Test run: dotnet test --no-restore --verbosity normal diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index d72acc82b..3ca646c72 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -49,7 +49,7 @@ jobs: run: dotnet restore - name: Spin Up Stack - run: docker-compose up -d + run: docker compose up -d - name: SonarCloud env: diff --git a/GetIntoTeachingApi/GetIntoTeachingApi.csproj b/GetIntoTeachingApi/GetIntoTeachingApi.csproj index 343adb731..d3b0e9976 100644 --- a/GetIntoTeachingApi/GetIntoTeachingApi.csproj +++ b/GetIntoTeachingApi/GetIntoTeachingApi.csproj @@ -24,7 +24,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -61,11 +61,11 @@ - + - + diff --git a/GetIntoTeachingApiTests/GetIntoTeachingApiTests.csproj b/GetIntoTeachingApiTests/GetIntoTeachingApiTests.csproj index a6784f672..41013808c 100644 --- a/GetIntoTeachingApiTests/GetIntoTeachingApiTests.csproj +++ b/GetIntoTeachingApiTests/GetIntoTeachingApiTests.csproj @@ -32,7 +32,7 @@ - runtime; build; native; contentfiles; analyzers; buildtransitive + runtime; build; native; contentfiles; analyzers; buildtransitive all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/README.md b/README.md index e77352b72..bbe3481ae 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ When the client is configured to point to the API, we need to ensure it uses the The API is an ASP.NET Core web application; to get up and running clone the repository and open `GetIntoTeachingApi.sln` in Visual Studio. -You will need to set up the environment before booting up the dependent services in Docker with `docker-compose up`. +You will need to set up the environment before booting up the dependent services in Docker with `docker compose up`. When the application runs in development it will open the Swagger documentation by default (the development shared secret for the admin client is `secret-admin`). @@ -101,13 +101,13 @@ Quick start steps: - `az login` - `make setup-local-env` - Set properties of the created env.local to "Always copy" -- `docker-compose up` +- `docker compose up` - Run the application in Visual Studio - Open the Swagger UI at `/swagger/index/html` or view the job queue at `/hangfire` ### Building and testing locally -This project is known to run in Mono, Microsoft Visual Studio and JetBrains Rider, including on a macos platform. The project must be built for .NET version 7.0. When running locally, be sure to start the docker-compose container prior to running the project. +This project is known to run in Mono, Microsoft Visual Studio and JetBrains Rider, including on a macos platform. The project must be built for .NET version 7.0. When running locally, be sure to start the docker compose container prior to running the project. Configure a local instance of the Get Into Teaching application to connect to a local instance of the API by setting the application's environment variables to match the API, e.g.