Skip to content

Commit b2a7eab

Browse files
Merge pull request #1164 from ethho/fix-ci-docker-compose
Fix docker compose commands in CI
2 parents 685b42c + c5d37d2 commit b2a7eab

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

.github/workflows/development.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
- name: Build pip artifacts
4343
run: |
4444
export HOST_UID=$(id -u)
45-
docker-compose -f docker-compose-build.yaml up --exit-code-from app --build
45+
docker compose -f docker-compose-build.yaml up --exit-code-from app --build
4646
echo "DJ_VERSION=${DJ_VERSION}" >> $GITHUB_ENV
4747
- if: matrix.py_ver == '3.9' && matrix.distro == 'debian'
4848
name: Add pip artifacts
@@ -89,7 +89,7 @@ jobs:
8989
COMPOSE_HTTP_TIMEOUT: "120"
9090
run: |
9191
export HOST_UID=$(id -u)
92-
docker-compose -f LNX-docker-compose.yml up --build --exit-code-from app
92+
docker compose -f LNX-docker-compose.yml up --build --exit-code-from app
9393
lint:
9494
runs-on: ubuntu-latest
9595
strategy:
@@ -220,7 +220,7 @@ jobs:
220220
- name: Publish pip release
221221
run: |
222222
export HOST_UID=$(id -u)
223-
docker-compose -f docker-compose-build.yaml run \
223+
docker compose -f docker-compose-build.yaml run \
224224
-e TWINE_USERNAME=${TWINE_USERNAME} -e TWINE_PASSWORD=${TWINE_PASSWORD} app \
225225
sh -c "pip install twine && python -m twine upload dist/*"
226226
- name: Login to DockerHub

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
- Changed - Returning success count after the .populate() call - PR [#1050](https://github.com/datajoint/datajoint-python/pull/1050)
1313
- Fixed - `Autopopulate.populate` excludes `reserved` jobs in addition to `ignore` and `error` jobs
1414
- Fixed - Issue [#1159]((https://github.com/datajoint/datajoint-python/pull/1159) (cascading delete) - PR [#1160](https://github.com/datajoint/datajoint-python/pull/1160)
15+
- Fixed - `docker compose` commands in CI [#1164](https://github.com/datajoint/datajoint-python/pull/1164)
1516

1617
### 0.14.1 -- Jun 02, 2023
1718
- Fixed - Fix altering a part table that uses the "master" keyword - PR [#991](https://github.com/datajoint/datajoint-python/pull/991)

0 commit comments

Comments
 (0)