From 8b227ce297ab8d315b91cf0801230d1da7ffa528 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 31 Mar 2021 23:20:32 +1100 Subject: [PATCH] More required packages, I guess... --- README.md | 1 + docker/Dockerfile | 18 +++++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 63948c35af..ef0556cceb 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) [![Coverage Status](https://coveralls.io/repos/github/inventree/InvenTree/badge.svg)](https://coveralls.io/github/inventree/InvenTree) ![PEP](https://github.com/inventree/inventree/actions/workflows/style.yaml/badge.svg) +![Docker Build](https://github.com/inventree/inventree/actions/workflows/docker.yaml/badge.svg) ![SQLite](https://github.com/inventree/inventree/actions/workflows/coverage.yaml/badge.svg) ![MySQL](https://github.com/inventree/inventree/actions/workflows/mysql.yaml/badge.svg) ![MariaDB](https://github.com/inventree/inventree/actions/workflows/mariadb.yaml/badge.svg) diff --git a/docker/Dockerfile b/docker/Dockerfile index 567e3390b0..51f147b670 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -21,17 +21,21 @@ RUN echo "Installing InvenTree '${INVENTREE_VERSION}' from ${INVENTREE_REPO}" RUN addgroup -S inventreegroup && adduser -S inventree -G inventreegroup WORKDIR /home/inventree -# Install git -RUN apk add --no-cache git +# Install required system packages +RUN apk add --no-cache git make bash \ + gcc libgcc g++ libstdc++ \ + libjpeg-turbo libjpeg-turbo-dev jpeg jpeg-dev \ + libffi libffi-dev \ + zlib zlib-dev \ +RUN apk add --no-cache cairo cairo-dev pango pango-dev +RUN apk add --no-cache fontconfig ttf-droid ttf-liberation ttf-dejavu ttf-opensans ttf-ubuntu-font-family font-croscore font-noto +RUN apk add --no-cache python3 +RUN apk add --no-cache postgresql-contrib postgresql-dev libpq +RUN apk add --no-cache mariadb-connector-c mariadb-dev # Clone source code RUN git clone --branch $INVENTREE_VERSION --depth 1 ${INVENTREE_REPO} ${INVENTREE_SRC_DIR} -# Install required system packages -RUN apk add --no-cache gcc g++ -RUN apk add --no-cache postgresql-contrib postgresql-dev libpq -RUN apk add --no-cache mariadb-connector-c mariadb-dev - # Install required PIP packages RUN python -m venv $INVENTREE_VENV && pip install --upgrade pip setuptools wheel RUN python -m venv $INVENTREE_VENV && pip install --no-cache-dir -U invoke