Skip to content

Commit

Permalink
chore: docker compose v2
Browse files Browse the repository at this point in the history
The `docker-compose` command has been replaced by `docker compose`.
The "version" tag has also been deprecated in docker-compose.yml.
  • Loading branch information
speed47 committed Aug 4, 2024
1 parent 388d44e commit e806e4b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ jobs:
else
echo "OK $nb CVEs reported"
fi
- name: check docker-compose run execution
- name: check docker compose run execution
run: |
expected=19
docker-compose build
nb=$(docker-compose run --rm spectre-meltdown-checker --batch json | jq '.[]|.CVE' | wc -l)
docker compose build
nb=$(docker compose run --rm spectre-meltdown-checker --batch json | jq '.[]|.CVE' | wc -l)
if [ "$nb" -ne "$expected" ]; then
echo "Invalid number of CVEs reported: $nb instead of $expected"
exit 1
Expand Down
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,13 @@ sudo ./spectre-meltdown-checker.sh
#### With docker-compose

```shell
docker-compose build
docker-compose run --rm spectre-meltdown-checker
docker compose build
docker compose run --rm spectre-meltdown-checker
```

Note that on older versions of docker, `docker-compose` is a separate command, so you might
need to replace the two `docker compose` occurences above by `docker-compose`.

#### Without docker-compose

```shell
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2'

services:
spectre-meltdown-checker:
build:
Expand Down

0 comments on commit e806e4b

Please sign in to comment.