Skip to content

Use docker-compose without having to set the --project-directory #547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hardbyte merged 1 commit into from
Apr 22, 2020
Merged

Use docker-compose without having to set the --project-directory #547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .azurePipeline/runDockerComposeTests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,14 @@ process_args "$@"
[[ $TYPE != "integrationtests" && $TYPE != "benchmark" && $TYPE != "tutorials" ]] && echoerr "ERROR: Unrecognized type '$TYPE'. Should be equal to 'integrationtests', 'benchmark' or 'tutorials'" && exit 1
export TAG=$TAG

commandPrefix="docker-compose -f tools/docker-compose.yml -f tools/ci.yml --project-directory . "
commandPrefix="docker-compose -f docker-compose.yml -f ci.yml "
if [[ "$NO_ANSI" == "TRUE" ]]; then
commandPrefix="$commandPrefix --no-ansi "
fi

# change current working directory to the tools directory
cd "${0%/*}/../tools"
Copy link
Collaborator

@wilko77 wilko77 Apr 22, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah right. I'm sure there is a universe where that command makes intuitive sense...


echo "Initialise the database and the object store"
$commandPrefix -p $PROJECT_NAME up objectstore_init db_init
echo "Initialisation complete"
Expand All @@ -80,7 +83,7 @@ fi
$commandPrefix -p $PROJECT_NAME up --abort-on-container-exit --exit-code-from $TYPE db minio redis backend worker nginx $TYPE
exit_code=$?
echo "Retrieve the $TYPE tests results."
$commandPrefix -p $PROJECT_NAME ps -q $TYPE | xargs -I@ docker cp @:$CREATED_RESULT_FILE $RESULT_FILE
$commandPrefix -p $PROJECT_NAME ps -q $TYPE | xargs -I@ docker cp @:$CREATED_RESULT_FILE ../$RESULT_FILE

echo "Cleaning."
$commandPrefix -p $PROJECT_NAME down -v
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ stages:
- template: .azurePipeline/templateSetVariableDockerTag.yml
- script: |
./.azurePipeline/runDockerComposeTests.sh --no-ansi -p es$(DOCKER_TAG)$(Build.SourceVersion) -t $(DOCKER_TAG) -o $(resultFile) --type integrationtests
displayName: 'Start docker compose benchmark'
displayName: 'Start docker compose'
- task: PublishTestResults@2
condition: succeededOrFailed()
inputs:
Expand Down
2 changes: 1 addition & 1 deletion tools/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ services:
entrypoint: |
/bin/sh /opt/init-object-store.sh
volumes:
- ./tools/init-object-store.sh:/opt/init-object-store.sh:ro
- ./init-object-store.sh:/opt/init-object-store.sh:ro
depends_on:
- minio

Expand Down