Merge pull request #821 from TeamPiped/docker-compose

Change from docker-compose command to docker compose.
This commit is contained in:
Kavin 2024-07-11 17:09:31 +01:00 committed by GitHub
commit c960f944d3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions

View File

@ -49,9 +49,9 @@ jobs:
file: ${{ matrix.dockerfile }} file: ${{ matrix.dockerfile }}
tags: 1337kavin/piped:latest tags: 1337kavin/piped:latest
- name: Start Docker-Compose services - name: Start Docker-Compose services
run: docker-compose -f ${{ matrix.docker-compose-file }} up -d && sleep ${{ matrix.sleep }} run: docker compose -f ${{ matrix.docker-compose-file }} up -d && sleep ${{ matrix.sleep }}
- name: Run tests - name: Run tests
run: ./testing/api-test.sh run: ./testing/api-test.sh
- name: Collect services logs - name: Collect services logs
if: failure() if: failure()
run: docker-compose -f ${{ matrix.docker-compose-file }} logs run: docker compose -f ${{ matrix.docker-compose-file }} logs

View File

@ -61,7 +61,7 @@ jobs:
file: ${{ matrix.dockerfile }} file: ${{ matrix.dockerfile }}
tags: 1337kavin/piped:latest tags: 1337kavin/piped:latest
- name: Start Docker-Compose services - name: Start Docker-Compose services
run: docker-compose -f ${{ matrix.docker-compose-file }} up -d && sleep ${{ matrix.sleep }} run: docker compose -f ${{ matrix.docker-compose-file }} up -d && sleep ${{ matrix.sleep }}
- run: rm piped.jar - run: rm piped.jar
- uses: actions/download-artifact@v4 - uses: actions/download-artifact@v4
with: with:
@ -74,9 +74,9 @@ jobs:
file: ${{ matrix.dockerfile }} file: ${{ matrix.dockerfile }}
tags: 1337kavin/piped:latest tags: 1337kavin/piped:latest
- name: Start Docker-Compose services - name: Start Docker-Compose services
run: docker-compose -f ${{ matrix.docker-compose-file }} up -d && sleep ${{ matrix.sleep }} run: docker compose -f ${{ matrix.docker-compose-file }} up -d && sleep ${{ matrix.sleep }}
- name: Run tests - name: Run tests
run: ./testing/api-test.sh run: ./testing/api-test.sh
- name: Collect services logs - name: Collect services logs
if: failure() if: failure()
run: docker-compose -f ${{ matrix.docker-compose-file }} logs run: docker compose -f ${{ matrix.docker-compose-file }} logs