Commit 46b2d85d authored by Дмитрий Сафронов's avatar Дмитрий Сафронов
Browse files

Merge branch 'reqs-over' into 'master' 

reqs-over

See merge request !2
parents bc8df0ce f5290e95

.dockerignore

+1 −0
Original line number Diff line number Diff line
@@ -2,4 +2,5 @@ 
**

!/Dockerfile

!/entrypoint.sh

!/requirements-override.txt

!/superuser.py

Dockerfile

+2 −2
Original line number Diff line number Diff line
@@ -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/*

requirements-override.txt

0 → 100644
+4 −0
Original line number Diff line number Diff line 
pytz==2022.2.1

tzdata==2022.2

mysqlclient

psycopg2