Skip to content

Commit af477a9

Browse files
committed
CI: docker-compose -> docker compose
Per [1]. [1] https://github.com/orgs/community/discussions/116610 Signed-off-by: Stephen Finucane <[email protected]>
1 parent 4dfe699 commit af477a9

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

.github/workflows/ci.yaml

+10-10
Original file line numberDiff line numberDiff line change
@@ -135,30 +135,30 @@ jobs:
135135
python-version: "3.12"
136136
- name: Build docker-compose service
137137
run: |
138-
docker-compose build --build-arg UID=$(id -u) --build-arg GID=$(id -g)
138+
docker compose build --build-arg UID=$(id -u) --build-arg GID=$(id -g)
139139
- name: Test createsuperuser/changepassword
140140
run: |
141-
docker-compose run -T --rm web \
141+
docker compose run -T --rm web \
142142
python manage.py createsuperuser \
143143
--username patchwork --no-input --email [email protected]
144144
{ echo patchwork; echo patchwork; } | \
145-
docker-compose run -T --rm web \
145+
docker compose run -T --rm web \
146146
python manage.py changepassword patchwork
147147
# FIXME(stephenfin): Re-enable this once dbbackup supports Django 4.0
148148
# - name: Test dbbackup/dbrestore
149149
# run: |
150-
# docker-compose run -T --rm web python manage.py dbbackup
151-
# echo y | docker-compose run -T --rm web python manage.py dbrestore
150+
# docker compose run -T --rm web python manage.py dbbackup
151+
# echo y | docker compose run -T --rm web python manage.py dbrestore
152152
- name: Modify database user permissions (mysql)
153153
if: ${{ matrix.db == 'mysql' }}
154154
run: |
155-
docker-compose exec -T -- db \
155+
docker compose exec -T -- db \
156156
sh -c "exec mysql -uroot -p\"\${MYSQL_ROOT_PASSWORD}\" -e \"GRANT ALL ON \\\`test\\_\${MYSQL_DATABASE}%\\\`.* to '\${MYSQL_USER}'@'%'; FLUSH PRIVILEGES;\""
157157
- name: Run unittest
158-
run: docker-compose run -T --rm web tox
158+
run: docker compose run -T --rm web tox
159159
- name: Test normal startup
160160
run: |
161-
docker-compose up --detach
161+
docker compose up --detach
162162
163163
for count in $(seq 50); do \
164164
if curl --fail --silent "http://localhost:8000"; then \
@@ -168,7 +168,7 @@ jobs:
168168
done
169169
echo
170170
171-
docker-compose ps
171+
docker compose ps
172172
- name: Test client access (git-pw)
173173
run: |
174174
python -m pip install git-pw
@@ -177,4 +177,4 @@ jobs:
177177
--username patchwork --password patchwork series list
178178
- name: Dump container logs
179179
if: ${{ always() }}
180-
run: docker-compose logs --no-color --timestamps
180+
run: docker compose logs --no-color --timestamps

0 commit comments

Comments
 (0)