diff --git a/.dockerignore b/.dockerignore index 0c103aaaae5d71ef713c24e4b7c8a176055d0be1..5c72a7036df8e54ea384ca317ecc2f4f4ffa72f0 100644 --- a/.dockerignore +++ b/.dockerignore @@ -2,4 +2,5 @@ ** !/Dockerfile !/entrypoint.sh +!/requirements-override.txt !/superuser.py diff --git a/Dockerfile b/Dockerfile index cbffbc87e9417de6d137f92cb1d08cbdca35fe10..9d488074fb51218075bf7c756bbbcc021d2b489d 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 0000000000000000000000000000000000000000..f3ac091bcf2de40d3f4b252c1b8f3ac61a4bb34c --- /dev/null +++ b/requirements-override.txt @@ -0,0 +1,4 @@ +pytz==2022.2.1 +tzdata==2022.2 +mysqlclient +psycopg2