Skip to content

Commit

Permalink
Merge pull request #5404 from dfe-analytical-services/dev
Browse files Browse the repository at this point in the history
Merge Dev into Master
  • Loading branch information
N-moh authored Nov 20, 2024
2 parents f478dce + a74c011 commit d311cb3
Show file tree
Hide file tree
Showing 73 changed files with 5,822 additions and 1,251 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/validate-snapshots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ jobs:
token: ${{ env.GH_TOKEN }}

- name: Slack Notification
uses: slackapi/[email protected].0
uses: slackapi/[email protected].1
with:
payload: |
{
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ The service can be started against a set of non-existent database. If no pre-exi
1. Start the SQL Server Docker container:

```
docker-compose up -d db
docker compose up -d db
```

2. Create empty `content` and `statistics` databases.
Expand Down Expand Up @@ -252,7 +252,7 @@ The Azurite Docker container can be started by one of the following methods:
3. Directly via Docker Compose

```bash
docker-compose up data-storage
docker compose up data-storage
```

### Setting up an Identity Provider (IdP)
Expand Down Expand Up @@ -284,7 +284,7 @@ The Keycloak Docker container can be started by one of the following methods:
```bash
src
docker-compose up idp
docker compose up idp
```
All the standard seed data users can be supported with Keycloak, and use their standard email addresses and the
Expand Down Expand Up @@ -316,7 +316,7 @@ To do this, you can run one of the following:
pnpm start idp --rebuild-docker
# Using Docker
docker-compose up --build --force-recreate idp
docker compose up --build --force-recreate idp
```
#### Using a custom Identity Provider
Expand Down Expand Up @@ -735,7 +735,7 @@ blobs, queues and tables. This is typically done at the same time as resetting t
To delete all data in Azurite simply delete the Azurite docker container, remove the Azurite volume and recreate it:
```bash
docker-compose up data-storage
docker compose up data-storage
```
Expand Down
Loading

0 comments on commit d311cb3

Please sign in to comment.