Skip to content

Commit

Permalink
replace docker-compose with docker compose
Browse files Browse the repository at this point in the history
  • Loading branch information
roflcoopter committed Apr 8, 2024
1 parent b2007ab commit a64b73e
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions azure-pipelines/templates/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,20 +59,20 @@ jobs:

# - script: |
# cd $(Agent.BuildDirectory)/s/docker
# docker-compose --file ../azure-pipelines/docker-compose-build.yaml --env-file ../azure-pipelines/.env pull $(arch)-${{ parameters.image }}
# docker compose --file ../azure-pipelines/docker-compose-build.yaml --env-file ../azure-pipelines/.env pull $(arch)-${{ parameters.image }}
# displayName: Pull image for Docker layer caching
# continueOnError: true
# condition: and(succeeded(), eq('${{ parameters.imageNameOnly }}', false))
# - script: |
# cd $(Agent.BuildDirectory)/s/docker
# docker-compose --file ../azure-pipelines/docker-compose-build.yaml --env-file ../azure-pipelines/.env pull ${{ parameters.image }}
# docker compose --file ../azure-pipelines/docker-compose-build.yaml --env-file ../azure-pipelines/.env pull ${{ parameters.image }}
# displayName: Pull image for Docker layer caching
# continueOnError: true
# condition: and(succeeded(), eq('${{ parameters.imageNameOnly }}', true))

- script: |
cd $(Agent.BuildDirectory)/s/docker
docker-compose --file ../azure-pipelines/docker-compose-build.yaml --env-file ../azure-pipelines/.env build --build-arg BUILDKIT_INLINE_CACHE=1 $(arch)-${{ parameters.image }}
docker compose --file ../azure-pipelines/docker-compose-build.yaml --env-file ../azure-pipelines/.env build --build-arg BUILDKIT_INLINE_CACHE=1 $(arch)-${{ parameters.image }}
displayName: Build $(arch)-${{ parameters.image }}
condition: and(succeeded(), eq('${{ parameters.imageNameOnly }}', false))
env:
Expand All @@ -81,7 +81,7 @@ jobs:
BUILDKIT_PROGRESS: plain
- script: |
cd $(Agent.BuildDirectory)/s/docker
docker-compose --file ../azure-pipelines/docker-compose-build.yaml --env-file ../azure-pipelines/.env build --build-arg BUILDKIT_INLINE_CACHE=1 ${{ parameters.image }}
docker compose --file ../azure-pipelines/docker-compose-build.yaml --env-file ../azure-pipelines/.env build --build-arg BUILDKIT_INLINE_CACHE=1 ${{ parameters.image }}
displayName: Build ${{ parameters.image }}
condition: and(succeeded(), eq('${{ parameters.imageNameOnly }}', true))
env:
Expand All @@ -92,12 +92,12 @@ jobs:
# Runs only for non-release triggers
- script: |
cd $(Agent.BuildDirectory)/s/docker
docker-compose --file ../azure-pipelines/docker-compose-build.yaml --env-file ../azure-pipelines/.env push $(arch)-${{ parameters.image }}
docker compose --file ../azure-pipelines/docker-compose-build.yaml --env-file ../azure-pipelines/.env push $(arch)-${{ parameters.image }}
displayName: Push $(arch)-${{ parameters.image }}
condition: and(succeeded(), eq('${{ parameters.imageNameOnly }}', false), eq('${{ parameters.release }}', false))
- script: |
cd $(Agent.BuildDirectory)/s/docker
docker-compose --file ../azure-pipelines/docker-compose-build.yaml --env-file ../azure-pipelines/.env push ${{ parameters.image }}
docker compose --file ../azure-pipelines/docker-compose-build.yaml --env-file ../azure-pipelines/.env push ${{ parameters.image }}
displayName: Push ${{ parameters.image }}
condition: and(succeeded(), eq('${{ parameters.imageNameOnly }}', true), eq('${{ parameters.release }}', false))
Expand Down

0 comments on commit a64b73e

Please sign in to comment.