Skip to content

Commit 10d28a9

Browse files
committed
docker: fix install location
1 parent ddbee74 commit 10d28a9

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

build-schema_salad-docker.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -ex
33
docker build --file=schema_salad.Dockerfile --tag=quay.io/commonwl/schema_salad .
44
docker run quay.io/commonwl/schema_salad /bin/sh -c \
5-
'apk add --no-cache py3-pip && pip install pytest-xdist && pytest --pyargs schema_salad -n auto'
5+
'apk add --no-cache py3-pip && pip install pytest-xdist && cd /tmp && pytest --pyargs schema_salad -n auto'
66

77
# version=$(git describe --tags)
88
# if echo "$version" | grep -vq '\-' >& /dev/null ; then

schema_salad.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN python3 -m venv env3
88
RUN source env3/bin/activate && python3 -m pip install -U pip setuptools wheel build
99
RUN export SETUPTOOLS_SCM_PRETEND_VERSION=$(grep __version__ schema_salad/_version.py | awk -F\' '{ print $2 }') ; source env3/bin/activate && SCHEMA_SALAD_USE_MYPYC=1 MYPYPATH=mypy-stubs python3 -m build --wheel --outdir=/wheels
1010
RUN source env3/bin/activate && python3 -m pip wheel -r requirements.txt --wheel-dir=/wheels
11-
RUN source env3/bin/activate && python3 -m pip install --force-reinstall --no-index --no-warn-script-location --root=/pythonroot/ /wheels/*.whl
11+
RUN source env3/bin/activate && python3 -m pip install --force-reinstall --no-index --no-warn-script-location --prefix=/pythonroot/usr /wheels/*.whl
1212

1313
FROM alpine:latest as module
1414
LABEL maintainer peter.amstutz@curoverse.com

0 commit comments

Comments
 (0)