Skip to content
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

Jump to bottom

tox pulls docker image from local registry #1

Open
wants to merge 2 commits into
base: mainline
Choose a base branch
from
Open

tox pulls docker image from local registry #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
badab62
Update clone_marqo_repo.sh
aryanagarwal9 Sep 26, 2022
7388879
Update tox.ini
aryanagarwal9 Sep 26, 2022
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
2 changes: 1 addition & 1 deletion scripts/clone_marqo_repo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ git fetch
git switch "$2"
git pull

DOCKER_BUILDKIT=1 docker build . -t marqo_docker_0 || exit 1
# DOCKER_BUILDKIT=1 docker build . -t marqo_docker_0 || exit 1
4 changes: 2 additions & 2 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ skipsdist = true
marqo_branch = mainline
; set this to a marqo image you want to test. Leave it as 'marqo_docker_0' to test the docker image
; that this tox script builds. You can set it to a marqo image found on dockerhub.
marqo_image_name = marqo_docker_0
marqo_image_name = localhost:5000/marqo/multiarch:latest

[testenv]
whitelist_externals =
Expand Down Expand Up @@ -87,4 +87,4 @@ setenv =
commands =
pip install --upgrade -r {toxinidir}{/}temp{/}marqo{/}requirements.txt
bash {toxinidir}{/}scripts{/}start_local_marqo_os_no_marqo.sh
pytest temp{/}marqo{/}tests{/} {posargs}
pytest temp{/}marqo{/}tests{/} {posargs}