Skip to content

Commit 982251e

Browse files
committed
refactoring docker test again
1 parent da0e9ad commit 982251e

2 files changed

Lines changed: 5 additions & 14 deletions

File tree

.github/workflows/tests.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,15 @@ jobs:
8787
- name: run Docker
8888
run: |
8989
python script/setup-docker/docker.py
90+
<<<<<<< HEAD
9091
<<<<<<< HEAD
9192
pip freeze > vetiver_requirements.txt
9293
=======
9394
pip freeze > requirements.txt
9495
>>>>>>> aa70c3e (always install latest vetiver in docker)
96+
=======
97+
pip freeze > vetiver_requirements.txt
98+
>>>>>>> 3edaa19 (refactoring docker test again)
9599
docker build -t mock .
96100
docker run -d -v $PWD/pinsboard:/vetiver/pinsboard -p 8080:8080 mock
97101
sleep 5

script/setup-docker/docker.py

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,6 @@
1212
v = vetiver.VetiverModel(model, "mymodel", ptype_data=X)
1313

1414
vetiver.vetiver_pin_write(board, v)
15-
<<<<<<< HEAD
16-
<<<<<<< HEAD
15+
1716

1817
vetiver.prepare_docker(board, "mymodel")
19-
=======
20-
vetiver.load_pkgs(
21-
v,
22-
packages=["git+https://github.com/rstudio/vetiver-python@metadata"],
23-
path="vetiver_",
24-
)
25-
=======
26-
vetiver.load_pkgs(v, path="vetiver_")
27-
>>>>>>> aa70c3e (always install latest vetiver in docker)
28-
vetiver.write_app(board, "mymodel")
29-
vetiver.write_docker()
30-
>>>>>>> 875faf2 (install into docker from branch)

0 commit comments

Comments
 (0)