Skip to content

Commit

Permalink
Remove references to deprecated / removed Docker Compose v1 commands
Browse files Browse the repository at this point in the history
  • Loading branch information
ntsim committed Nov 11, 2024
1 parent 5d66047 commit 9db61b3
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
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
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Once you have done this, ensure the public API Docker database is running:

```bash
# Via Docker Compose
docker-compose up -d public-api-db
docker compose up -d public-api-db

# Via project start script
pnpm start publicApiDb
Expand Down
6 changes: 3 additions & 3 deletions tests/performance-tests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ The performance test suite is built using [k6](https://k6.io/) and visualised us

## How it works

* We run InfluxDB (for collecting data) and Grafana (for visualising the collected data) using docker-compose.
* We run the K6 tests using docker-compose. We can choose specific tests to run from the CLI.
* We run InfluxDB (for collecting data) and Grafana (for visualising the collected data) using Docker Compose.
* We run the K6 tests using Docker Compose. We can choose specific tests to run from the CLI.
* The K6 tests run and post data to InfluxDB.
* Grafana is set up with a Dashboard that consumes and visualises data from the InfluxDB data source.

Expand Down Expand Up @@ -382,4 +382,4 @@ sysctl -w net.ipv4.ip_local_port_range="1024 65535"
sysctl -w net.ipv4.tcp_tw_reuse=1
sysctl -w net.ipv4.tcp_timestamps=1
ulimit -n 250000
```
```
10 changes: 5 additions & 5 deletions tests/performance-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
"private": true,
"scripts": {
"webpack": "webpack",
"start": "docker-compose up -d influxdb grafana",
"stop": "docker-compose down",
"stop-and-clear-data": "docker-compose down -v",
"store-environment-details": "docker-compose run --rm --user \"$(id -u):$(id -g)\" node -r source-map-support/register dist/storeEnvironmentDetails.js ${npm_config_environment} ${npm_config_users}",
"test": "cross-env TEST_ENVIRONMENT=${npm_config_environment} docker-compose run --rm k6 run",
"start": "docker compose up -d influxdb grafana",
"stop": "docker compose down",
"stop-and-clear-data": "docker compose down -v",
"store-environment-details": "docker compose run --rm --user \"$(id -u):$(id -g)\" node -r source-map-support/register dist/storeEnvironmentDetails.js ${npm_config_environment} ${npm_config_users}",
"test": "cross-env TEST_ENVIRONMENT=${npm_config_environment} docker compose run --rm k6 run",
"tsc": "tsc --noEmit"
},
"dependencies": {
Expand Down
6 changes: 3 additions & 3 deletions useful-scripts/start.ts
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ async function startDockerServices() {
if (programOpts.restartDocker) {
logInfo('Stopping Docker services...');

await $$`docker-compose stop ${[...dockerServicesToStart]}`;
await $$`docker compose stop ${[...dockerServicesToStart]}`;
}

logInfo('Starting Docker services...');
Expand All @@ -319,7 +319,7 @@ async function startDockerServices() {
args.push('--build', '--force-recreate');
}

await $$`docker-compose up ${[...args, ...dockerServicesToStart]}`;
await $$`docker compose up ${[...args, ...dockerServicesToStart]}`;

await delay(1000);
}
Expand Down Expand Up @@ -392,7 +392,7 @@ async function startService(service: ServiceName): Promise<void> {
break;
}
case 'docker': {
command = 'docker-compose logs';
command = 'docker compose logs';
args = ['-f', '--no-log-prefix'];

if (programOpts.rebuildDocker) {
Expand Down

0 comments on commit 9db61b3

Please sign in to comment.