Skip to content
Snippets Groups Projects
Commit afac8a98 authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch 'builddeps-missing' into 'master'

Allow to install system and build dependencies. Advances AlekSIS#29

See merge request !675
parents 40563631 44b0b428
No related branches found
No related tags found
1 merge request!675Allow to install system and build dependencies. Advances AlekSIS#29
Pipeline #19005 canceled
Pipeline: AlekSIS

#19010

    ......@@ -9,6 +9,11 @@ and this project adheres to `Semantic Versioning`_.
    Unreleased
    ----------
    Added
    ~~~~~
    * Allow to install system and build dependencies in docker build
    Changed
    ~~~~~~~
    ......
    ......@@ -95,7 +95,18 @@ USER 33:33
    # Additional steps
    ONBUILD ARG APPS
    ONBUILD ARG BUILD_DEPS
    ONBUILD ARG SYSTEM_DEPS
    ONBUILD USER 0:0
    ONBUILD RUN set -e; \
    if [ -n "$BUILD_DEPS" ]; then \
    eatmydata apt-get update; \
    eatmydata apt-get install -y $BUILD_DEPS; \
    fi; \
    if [ -n "$SYSTEM_DEPS" ]; then \
    eatmydata apt-get update; \
    eatmydata apt-get install -y $SYSTEM_DEPS; \
    fi; \
    ONBUILD RUN set -e; \
    if [ -n "$APPS" ]; then \
    eatmydata pip install $APPS; \
    ......@@ -103,7 +114,7 @@ ONBUILD RUN set -e; \
    eatmydata aleksis-admin yarn install; \
    eatmydata aleksis-admin collectstatic --no-input; \
    rm -rf /usr/local/share/.cache; \
    eatmydata apt-get remove --purge -y yarnpkg; \
    eatmydata apt-get remove --purge -y yarnpkg $BUILD_DEPS; \
    eatmydata apt-get autoremove --purge -y; \
    apt-get clean -y; \
    rm -f /var/lib/apt/lists/*_*; \
    ......
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment