From cc2b984080d719a0d0327c1bba6f26e3059f6b29 Mon Sep 17 00:00:00 2001 From: krateng Date: Thu, 10 Mar 2022 07:11:39 +0100 Subject: [PATCH] Updated requirements --- APKBUILD | 2 +- Dockerfile | 27 ++++++++++++++++++--------- dev/install_dependencies_alpine.sh | 2 +- install_alpine.sh | 1 + pyproject.toml | 8 +++++--- requirements.txt | 5 +++-- 6 files changed, 29 insertions(+), 16 deletions(-) diff --git a/APKBUILD b/APKBUILD index 5e118c2..4f27581 100644 --- a/APKBUILD +++ b/APKBUILD @@ -10,7 +10,7 @@ license="GPL-3.0" depends="python3 tzdata" pkgusers=$pkgname pkggroups=$pkgname -depends_dev="gcc python3-dev libxml2-dev libxslt-dev libffi-dev libc-dev py3-pip linux-headers" +depends_dev="gcc g++ python3-dev libxml2-dev libxslt-dev libffi-dev libc-dev py3-pip linux-headers" makedepends="$depends_dev" source=" $pkgname-$pkgver.tar.gz::https://github.com/krateng/maloja/archive/refs/tags/v$pkgver.tar.gz diff --git a/Dockerfile b/Dockerfile index 441bedf..e30dfa4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,24 +1,33 @@ -FROM python:3-alpine +FROM alpine:3.15 +# Python image includes two Python versions, so use base Alpine # Based on the work of Jonathan Boeckel -# https://gitlab.com/Joniator/docker-maloja -# https://github.com/Joniator WORKDIR /usr/src/app -# this should change rarely, can be cached +# Install run dependencies first +RUN apk add --no-cache python3 tzdata + +# system pip could be removed after build, but apk then decides to also remove all its +# python dependencies, even if they are explicitly installed as python packages +# whut +RUN \ + apk add py3-pip && \ + pip install wheel + COPY ./requirements.txt ./requirements.txt -# Install everything before copying rest of the project, can be cached RUN \ - apk add --no-cache --virtual .build-deps gcc python3-dev libxml2-dev libxslt-dev libffi-dev libc-dev py3-pip linux-headers && \ - apk add --no-cache python3 tzdata && \ - pip3 install --no-cache-dir -r requirements.txt && \ + apk add --no-cache --virtual .build-deps gcc g++ python3-dev libxml2-dev libxslt-dev libffi-dev libc-dev py3-pip linux-headers && \ + pip install --no-cache-dir -r requirements.txt && \ apk del .build-deps +# no chance for caching below here + COPY . . -RUN pip3 install /usr/src/app + +RUN pip install /usr/src/app # Docker-specific configuration and default to IPv4 ENV MALOJA_SKIP_SETUP=yes diff --git a/dev/install_dependencies_alpine.sh b/dev/install_dependencies_alpine.sh index 64a3a71..0d6f320 100644 --- a/dev/install_dependencies_alpine.sh +++ b/dev/install_dependencies_alpine.sh @@ -1,4 +1,4 @@ apk add \ - gcc python3-dev libxml2-dev libxslt-dev libffi-dev libc-dev py3-pip linux-headers \ + gcc g++ python3-dev libxml2-dev libxslt-dev libffi-dev libc-dev py3-pip linux-headers \ python3 tzdata \ vips diff --git a/install_alpine.sh b/install_alpine.sh index 70b42ca..5c890e6 100644 --- a/install_alpine.sh +++ b/install_alpine.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash apk add \ gcc \ + g++ \ python3-dev \ libxml2-dev \ libxslt-dev \ diff --git a/pyproject.toml b/pyproject.toml index fad301d..ef519db 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,8 +21,8 @@ classifiers = [ dependencies = [ "bottle>=0.12.16", "waitress>=1.3", - "doreah>=1.7.4, <2", - "nimrodel>=0.7.0", + "doreah>=1.7.5, <2", + "nimrodel>=0.8.0", "setproctitle>=1.1.10", #"pyvips>=2.1.16", "jinja2>=2.11", @@ -30,7 +30,8 @@ dependencies = [ "css_html_js_minify>=2.5.5", "psutil>=5.8.0", "sqlalchemy>=1.4", - "python-datauri>=1.1.0" + "python-datauri>=1.1.0", + "requests>=2.27.1" ] [project.optional-dependencies] @@ -51,6 +52,7 @@ name = "maloja" [tool.osreqs.alpine] build =[ "gcc", + "g++", "python3-dev", "libxml2-dev", "libxslt-dev", diff --git a/requirements.txt b/requirements.txt index fe080b6..45fca0d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ bottle>=0.12.16 waitress>=1.3 -doreah>=1.7.4, <2 -nimrodel>=0.7.0 +doreah>=1.7.5, <2 +nimrodel>=0.8.0 setproctitle>=1.1.10 jinja2>=2.11 lru-dict>=1.1.6 @@ -9,4 +9,5 @@ css_html_js_minify>=2.5.5 psutil>=5.8.0 sqlalchemy>=1.4 python-datauri>=1.1.0 +requests>=2.27.1