Skip to content

Commit 00673b3

Browse files
committed
ci: move to docker compose v2
Use docker-compose v2 as per the removal of v1 from GitHub Actions runners. <actions/runner-images#9692>
1 parent 294dc59 commit 00673b3

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# This file is part of CERN Open Data Portal.
2-
# Copyright (C) 2020, 2023 CERN.
2+
# Copyright (C) 2020, 2023, 2024 CERN.
33
#
44
# CERN Open Data Portal is free software; you can redistribute it
55
# and/or modify it under the terms of the GNU General Public License as
@@ -157,7 +157,7 @@ jobs:
157157
run: ./run-tests.sh --check-docker-build
158158

159159
- name: Run pytest
160-
run: docker-compose run --rm web ./run-tests.sh --check-pytest
160+
run: docker compose run --rm web ./run-tests.sh --check-pytest
161161

162162
- name: Codecov Coverage
163163
uses: codecov/codecov-action@v1

docker-compose-dev.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ services:
227227
## ! Remember to set / uncomment `SENTRY_DSN` and `LOGGING_SENTRY_CELERY`
228228
## ! environment variables for cernopendata services and
229229
## ! enable cernopendata service to reach sentry-service
230-
## ! (e.g. by 'links' docker-compose definition).
230+
## ! (e.g. by 'links' docker compose definition).
231231
## ! Default DSN public key: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
232232
## ! Default DSN secret key: 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
233233
## Sentry UI can be reached at 'http://127.0.0.1:9000'
@@ -242,7 +242,7 @@ services:
242242
# build: ./sentry
243243
# image: cernopendata/sentry
244244
# environment:
245-
# # Run `docker-compose run sentry config generate-secret-key`
245+
# # Run `docker compose run sentry config generate-secret-key`
246246
# # to get a proper the SENTRY_SECRET_KEY value.
247247
# - SENTRY_SECRET_KEY=more_than_thirty_two_characters_long_secret_key
248248
# - SENTRY_REDIS_HOST=redis

run-tests.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22
#
33
# This file is part of CERN Open Data Portal.
4-
# Copyright (C) 2015, 2016, 2017, 2018, 2019, 2020 CERN.
4+
# Copyright (C) 2015, 2016, 2017, 2018, 2019, 2020, 2024 CERN.
55
#
66
# CERN Open Data Portal is free software; you can redistribute it
77
# and/or modify it under the terms of the GNU General Public License as
@@ -104,7 +104,7 @@ check_manifest () {
104104
}
105105

106106
check_docker_build () {
107-
docker-compose build
107+
docker compose build
108108
}
109109

110110
check_pytest () {

0 commit comments

Comments
 (0)