diff --git a/Dockerfile b/Dockerfile index 3513047df4e98250011aab84ada0c7bde366b7a0..681190122bc18fe1fd7d553ed8a48e01ff5204f8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,22 +27,22 @@ RUN apt-get update && \ ############################################################ FROM base AS builder -ENV BUILD_DEPENDENCIES="pkg-config build-essential python3-dev libmariadb-dev libpq-dev libxml2-dev libxslt-dev libffi-dev libjpeg-dev zlib1g-dev liblzma-dev libbz2-dev" -COPY --from=git /tmp/requirements.txt /home/sopds/ -COPY requirements-override.txt /home/sopds/ +ENV BUILD_DEPENDENCIES="pkg-config build-essential libmariadb-dev libpq-dev libxml2-dev libxslt-dev libffi-dev libjpeg-dev zlib1g-dev liblzma-dev libbz2-dev" RUN apt-get update && \ apt-get install --no-install-recommends -y ${BUILD_DEPENDENCIES} && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* && \ - python3 -m venv /opt/sopds && \ - pip3 install --ignore-installed --no-cache-dir --upgrade --disable-pip-version-check pip setuptools wheel && \ + python3 -m venv /opt/sopds +COPY --from=git /tmp/requirements.txt /home/sopds/ +COPY requirements-override.txt /home/sopds/ +RUN pip3 install --ignore-installed --no-cache-dir --upgrade --disable-pip-version-check pip setuptools wheel && \ pip3 install --ignore-installed --no-cache-dir -r requirements.txt -r requirements-override.txt && \ - find /opt/sopds \( -type d -a -name test -o -name tests \) -o \( -type f -a -name '*.pyc' -o -name '*.pyo' \) -exec rm -rvf '{}' \+ + find /opt/sopds \( -type d -a -name test -o -name tests \) -o \( -type f -a -name '*.pyo' -o -name '*.pyc' \) -exec rm -rvf '{}' \+ ############################################################ FROM base AS runtime -ENV RUNTIME_DEPENDENCIES="sudo unzip" \ +ENV RUNTIME_DEPENDENCIES="unzip" \ OWNER_UID=1000 \ OWNER_GID=1000 RUN apt-get update && \ diff --git a/requirements-override.txt b/requirements-override.txt index ba84f09670cddc163113fee60541b256f4908a1f..8048ee334ea251d2e1ba999dc527d72115d54668 100644 --- a/requirements-override.txt +++ b/requirements-override.txt @@ -3,3 +3,6 @@ pytz==2022.2.1 tzdata==2022.2 mysqlclient psycopg2 + + +Django >= 1.10, < 3.0; python_version >= '3.4'