From f5290e959ee507fc61c7295a1b9c36484c813a59 Mon Sep 17 00:00:00 2001 From: Dmitriy Safronov Date: Sun, 28 May 2023 16:54:37 +0400 Subject: [PATCH] reqs-over --- .dockerignore | 1 + Dockerfile | 4 ++-- requirements-override.txt | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 requirements-override.txt diff --git a/.dockerignore b/.dockerignore index 0c103aa..5c72a70 100644 --- a/.dockerignore +++ b/.dockerignore @@ -2,4 +2,5 @@ ** !/Dockerfile !/entrypoint.sh +!/requirements-override.txt !/superuser.py diff --git a/Dockerfile b/Dockerfile index cbffbc8..9d48807 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,12 +24,12 @@ RUN set -ex && \ FROM base AS builder ENV BUILD_DEPENDENCIES="gcc build-base python3-dev musl-dev mariadb-connector-c-dev libpq-dev libxml2-dev libxslt-dev libffi-dev jpeg-dev zlib-dev xz-dev bzip2-dev" COPY --from=git /tmp/requirements.txt /home/sopds/ +COPY requirements-override.txt /home/sopds/ RUN set -ex && \ apk --no-cache add --virtual build-dependencies ${BUILD_DEPENDENCIES} && \ python3 -m venv /opt/sopds && \ 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 && \ - pip3 install --ignore-installed --no-cache-dir mysqlclient psycopg2 && \ + 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 '{}' \+ && \ #apk del build-dependencies && \ rm -rf /var/cache/apk/* diff --git a/requirements-override.txt b/requirements-override.txt new file mode 100644 index 0000000..f3ac091 --- /dev/null +++ b/requirements-override.txt @@ -0,0 +1,4 @@ +pytz==2022.2.1 +tzdata==2022.2 +mysqlclient +psycopg2 -- GitLab