Skip to content

Commit

Permalink
CI: docker-compose -> docker compose
Browse files Browse the repository at this point in the history
Per [1].

[1] https://github.com/orgs/community/discussions/116610

Signed-off-by: Stephen Finucane <stephen@that.guru>
  • Loading branch information
stephenfin committed Oct 23, 2024
1 parent 4dfe699 commit af477a9
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -135,30 +135,30 @@ jobs:
python-version: "3.12"
- name: Build docker-compose service
run: |
docker-compose build --build-arg UID=$(id -u) --build-arg GID=$(id -g)
docker compose build --build-arg UID=$(id -u) --build-arg GID=$(id -g)
- name: Test createsuperuser/changepassword
run: |
docker-compose run -T --rm web \
docker compose run -T --rm web \
python manage.py createsuperuser \
--username patchwork --no-input --email test@example.com
{ echo patchwork; echo patchwork; } | \
docker-compose run -T --rm web \
docker compose run -T --rm web \
python manage.py changepassword patchwork
# FIXME(stephenfin): Re-enable this once dbbackup supports Django 4.0
# - name: Test dbbackup/dbrestore
# run: |
# docker-compose run -T --rm web python manage.py dbbackup
# echo y | docker-compose run -T --rm web python manage.py dbrestore
# docker compose run -T --rm web python manage.py dbbackup
# echo y | docker compose run -T --rm web python manage.py dbrestore
- name: Modify database user permissions (mysql)
if: ${{ matrix.db == 'mysql' }}
run: |
docker-compose exec -T -- db \
docker compose exec -T -- db \
sh -c "exec mysql -uroot -p\"\${MYSQL_ROOT_PASSWORD}\" -e \"GRANT ALL ON \\\`test\\_\${MYSQL_DATABASE}%\\\`.* to '\${MYSQL_USER}'@'%'; FLUSH PRIVILEGES;\""
- name: Run unittest
run: docker-compose run -T --rm web tox
run: docker compose run -T --rm web tox
- name: Test normal startup
run: |
docker-compose up --detach
docker compose up --detach
for count in $(seq 50); do \
if curl --fail --silent "http://localhost:8000"; then \
Expand All @@ -168,7 +168,7 @@ jobs:
done
echo
docker-compose ps
docker compose ps
- name: Test client access (git-pw)
run: |
python -m pip install git-pw
Expand All @@ -177,4 +177,4 @@ jobs:
--username patchwork --password patchwork series list
- name: Dump container logs
if: ${{ always() }}
run: docker-compose logs --no-color --timestamps
run: docker compose logs --no-color --timestamps

0 comments on commit af477a9

Please sign in to comment.