mirror/maloja
1
0
Fork 0
mirror of https://github.com/krateng/maloja.git synced 2023-08-10 21:12:55 +03:00
Code Issues Projects Releases Wiki Activity

Updated requirements

Browse Source
This commit is contained in:
krateng 2022-03-10 07:11:39 +01:00
parent 34e0b0fd67
commit cc2b984080
6 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
APKBUILD
View File

@ -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

27
Dockerfile
View File

@ -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 <jonathanboeckel1996@gmail.com>
# 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

2
dev/install_dependencies_alpine.sh
View File

@ -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

1
install_alpine.sh
View File

@ -1,6 +1,7 @@
#!/usr/bin/env bash
apk add \
gcc \
g++ \
python3-dev \
libxml2-dev \
libxslt-dev \

8
pyproject.toml
View File

@ -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",

5
requirements.txt
View File

@ -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