From 3bd1bfd5e742da60cc113dc18b2da327aa2014e3 Mon Sep 17 00:00:00 2001 From: Marco Zeisler Date: Tue, 11 May 2021 18:41:14 +0200 Subject: [PATCH] build backend in CI use this build package in docker-compose; (cherry picked from commit 1d1dd227fae29afe6b3843a24dcbb1aa3c602762) --- backend/Dockerfile | 32 ++++++++++++++++++-------------- backend/setup.py | 2 +- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index 5a43e77..c7f900e 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -2,20 +2,24 @@ FROM python:3.8-slim ENV PYTHONUNBUFFERED 1 ENV PATH="/opt/venv/bin:$PATH" -RUN apt-get update; \ - apt-get install -y build-essential gcc; \ - python -m venv /opt/venv; \ - python -m pip install --upgrade pip; \ - mkdir /code; - -WORKDIR /code - -COPY setup.py /code/ -COPY requirements.txt /code/ - -RUN pip install -r requirements.txt +# will be build in a different stage in CI +#RUN apt-get update; \ +# apt-get install -y build-essential gcc; \ +# python -m venv /opt/venv; \ +# python -m pip install --upgrade pip; \ +# mkdir /code; +# +#WORKDIR /code +# +#COPY setup.py /code/ +#COPY requirements.txt /code/ +# +#RUN pip install -r requirements.txt +# install and use built artifact COPY . /code/ +WORKDIR /code +RUN pip install ./dist/waecm* -RUN chmod 777 scripts/entrypoint.sh -ENTRYPOINT ["scripts/entrypoint.sh"] +RUN chmod 777 ./scripts/entrypoint.sh +ENTRYPOINT ["./scripts/entrypoint.sh"] diff --git a/backend/setup.py b/backend/setup.py index ea14854..4c693f4 100644 --- a/backend/setup.py +++ b/backend/setup.py @@ -5,7 +5,7 @@ from setuptools import find_packages, setup os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir))) setup(name='waecm-2021-group-04', - version='0.0.0', + version='3', packages=find_packages(), include_package_data=True, install_requires=[