Reworked everything again

DEVELOPMENT.md

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

Dockerfile

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

Dockerfile-pypi

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

install/alpine_requirements.sh

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

install/alpine_requirements_build.sh

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

install/alpine_requirements_build_volatile.sh

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

install/alpine_requirements_run.sh

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

install/dependencies_build.txt

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

install/dependencies_run.txt

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

install/install_dependencies.sh

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

install_alpine.sh

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