diff --git a/Makefile b/Makefile index 1c6dc9f..530bcb3 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ OUTPUT_DIR = artifacts/ KEYWORDS_REPO = git@github.com:nspcc-dev/neofs-keywords.git VENVS = $(shell ls -1d venv/*/ | sort -u | xargs basename -a) ROOT_DIR := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST)))) -DEV_IMAGE_PY ?= registry.spb.yadro.com/tools/pytest-neofs-x86_64:6 +DEV_IMAGE_PY ?= registry.spb.yadro.com/tools/pytest-neofs-x86_64:7 SETUP_DIR ?= $(CURDIR)/.setup DEV_ENV_DEPLOY_DIR ?= /opt/dev-env diff --git a/pytest_tests/Dockerfile b/pytest_tests/Dockerfile index cb43ab3..404dc28 100644 --- a/pytest_tests/Dockerfile +++ b/pytest_tests/Dockerfile @@ -23,19 +23,21 @@ RUN apt-get -y update && apt-get -y install \ && rm -rf /var/lib/apt/lists/* \ && apt-get clean -COPY requirements.txt ./ - # install aws cli utility v2 from pip RUN python3 -m pip install awscliv2 RUN ln /usr/local/bin/awscliv2 /usr/bin/aws RUN awsv2 --install RUN aws --version +COPY neofs-keywords/requirements.txt ./ RUN pip install --no-cache-dir -r requirements.txt -ENV PATH=$PATH:/root:/neofs +COPY pytest_tests/requirements.txt ./ +RUN pip install --no-cache-dir -r requirements.txt + +ENV PATH=$PATH:/root:/neofs WORKDIR /root COPY id_rsa /root/.ssh/id_rsa -ENTRYPOINT ["tini", "--", "pytest"] \ No newline at end of file +ENTRYPOINT ["tini", "--", "pytest"]