1
0
mirror of https://github.com/krateng/maloja.git synced 2023-08-10 21:12:55 +03:00

Reworked everything again

This commit is contained in:
krateng 2021-12-23 08:48:39 +01:00
parent 9f4041de78
commit e53588b402
11 changed files with 23 additions and 16 deletions

View File

@ -4,7 +4,7 @@ After you've cloned the repository, traverse into the `maloja` folder with `cd m
Your system needs several packages installed. On Alpine, this can be done with
`sh ./install/alpine_requirements.sh`
`sh ./install/install_dependencies.sh`
For other distros, try to find the equivalents of the packages listed or simply check your error output.

View File

@ -11,10 +11,10 @@ WORKDIR /usr/src/app
COPY . .
RUN \
# Build dependencies
sh ./install/alpine_requirements_build_volatile.sh && \
# Runtime dependencies
sh ./install/alpine_requirements_run.sh && \
# Build dependencies (This will pipe all packages from the file)
sed 's/#.*//' ./install/dependencies_build.txt | xargs apk add --no-cache --virtual .build-deps && \
# Runtime dependencies (Same)
sed 's/#.*//' ./install/dependencies_run.txt | xargs apk add && \
# Python dependencies
pip3 install --no-cache-dir -r requirements.txt && \
# Local project install

View File

@ -11,10 +11,10 @@ WORKDIR /usr/src/app
COPY ./install ./install
RUN \
# Build dependencies
sh ./install/alpine_requirements_build_volatile.sh && \
# Runtime dependencies
sh ./install/alpine_requirements_run.sh && \
# Build dependencies (This will pipe all packages from the file)
sed 's/#.*//' ./install/dependencies_build.txt | xargs apk add --no-cache --virtual .build-deps && \
# Runtime dependencies (Same)
sed 's/#.*//' ./install/dependencies_run.txt | xargs apk add && \
# PyPI install

View File

@ -1,2 +0,0 @@
sh ./install/alpine_requirements_run.sh
sh ./install/alpine_requirements_build.sh

View File

@ -1 +0,0 @@
apk add gcc libxml2-dev libxslt-dev py3-pip libc-dev linux-headers

View File

@ -1 +0,0 @@
apk add --no-cache --virtual .build-deps gcc libxml2-dev libxslt-dev py3-pip libc-dev linux-headers

View File

@ -1 +0,0 @@
apk add python3 python3-dev imagemagick tzdata

View File

@ -0,0 +1,6 @@
gcc
libxml2-dev
libxslt-dev
py3-pip
libc-dev
linux-headers

View File

@ -0,0 +1,4 @@
python3
python3-dev
imagemagick
tzdata

View File

@ -0,0 +1,2 @@
sed 's/#.*//' ./install/dependencies_run.txt | xargs apk add
sed 's/#.*//' ./install/dependencies_build.txt | xargs apk add

View File

@ -1,5 +1,5 @@
#!/usr/bin/env bash
sh ./install/alpine_requirements_run.sh
sh ./install/alpine_requirements_build.sh
sed 's/#.*//' ./install/deps_build.txt | xargs apk add
sed 's/#.*//' ./install/deps_run.txt | xargs apk add
pip3 install wheel
pip3 install malojaserver