mirror of
https://github.com/inventree/InvenTree.git
synced 2025-04-30 04:26:44 +00:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
5f159e5f02
@ -9,6 +9,9 @@ ARG tag=""
|
|||||||
|
|
||||||
ENV PYTHONUNBUFFERED 1
|
ENV PYTHONUNBUFFERED 1
|
||||||
|
|
||||||
|
# Ref: https://github.com/pyca/cryptography/issues/5776
|
||||||
|
ENV CRYPTOGRAPHY_DONT_BUILD_RUST 1
|
||||||
|
|
||||||
# InvenTree key settings
|
# InvenTree key settings
|
||||||
|
|
||||||
# The INVENTREE_HOME directory is where the InvenTree source repository will be located
|
# The INVENTREE_HOME directory is where the InvenTree source repository will be located
|
||||||
@ -51,6 +54,8 @@ LABEL org.label-schema.schema-version="1.0" \
|
|||||||
# Create user account
|
# Create user account
|
||||||
RUN addgroup -S inventreegroup && adduser -S inventree -G inventreegroup
|
RUN addgroup -S inventreegroup && adduser -S inventree -G inventreegroup
|
||||||
|
|
||||||
|
RUN apk -U upgrade
|
||||||
|
|
||||||
# Install required system packages
|
# Install required system packages
|
||||||
RUN apk add --no-cache git make bash \
|
RUN apk add --no-cache git make bash \
|
||||||
gcc libgcc g++ libstdc++ \
|
gcc libgcc g++ libstdc++ \
|
||||||
@ -70,7 +75,10 @@ RUN apk add --no-cache git make bash \
|
|||||||
# MySQL/MariaDB support
|
# MySQL/MariaDB support
|
||||||
mariadb-connector-c mariadb-dev mariadb-client \
|
mariadb-connector-c mariadb-dev mariadb-client \
|
||||||
# Required for python cryptography support
|
# Required for python cryptography support
|
||||||
rust cargo
|
openssl-dev musl-dev libffi-dev rust cargo
|
||||||
|
|
||||||
|
# Update pip
|
||||||
|
RUN pip install --upgrade pip
|
||||||
|
|
||||||
# Install required base-level python packages
|
# Install required base-level python packages
|
||||||
COPY requirements.txt requirements.txt
|
COPY requirements.txt requirements.txt
|
||||||
@ -130,4 +138,3 @@ ENTRYPOINT ["/bin/bash", "./docker/init.sh"]
|
|||||||
|
|
||||||
# Launch the development server
|
# Launch the development server
|
||||||
CMD ["invoke", "server", "-a", "${INVENTREE_WEB_ADDR}:${INVENTREE_WEB_PORT}"]
|
CMD ["invoke", "server", "-a", "${INVENTREE_WEB_ADDR}:${INVENTREE_WEB_PORT}"]
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user