mirror of
https://github.com/inventree/InvenTree.git
synced 2025-06-18 21:15:41 +00:00
Further devcontainer updates
- Bump postgresql image from 13 to 15 - Store psql data in the dev/psql directory - Install required frontend packages
This commit is contained in:
@ -12,8 +12,7 @@ ENV INVENTREE_STATIC_ROOT="${INVENTREE_DATA_DIR}/static"
|
|||||||
ENV INVENTREE_MEDIA_ROOT="${INVENTREE_DATA_DIR}/media"
|
ENV INVENTREE_MEDIA_ROOT="${INVENTREE_DATA_DIR}/media"
|
||||||
ENV INVENTREE_BACKUP_DIR="${INVENTREE_DATA_DIR}/backup"
|
ENV INVENTREE_BACKUP_DIR="${INVENTREE_DATA_DIR}/backup"
|
||||||
ENV INVENTREE_PLUGIN_DIR="${INVENTREE_DATA_DIR}/plugins"
|
ENV INVENTREE_PLUGIN_DIR="${INVENTREE_DATA_DIR}/plugins"
|
||||||
|
ENV INVENTREE_CONFIG_FILE="${INVENTREE_DATA_DIR}/config.yaml"
|
||||||
ENV INVENTREE_DOCKER="true"
|
|
||||||
|
|
||||||
COPY contrib/container/init.sh ./
|
COPY contrib/container/init.sh ./
|
||||||
RUN chmod +x init.sh
|
RUN chmod +x init.sh
|
||||||
@ -26,6 +25,12 @@ RUN apt update && apt install -y \
|
|||||||
libpango1.0-0 libcairo2 \
|
libpango1.0-0 libcairo2 \
|
||||||
weasyprint
|
weasyprint
|
||||||
|
|
||||||
|
# Install packages required for frontend development
|
||||||
|
RUN apt install -y \
|
||||||
|
yarn nodejs npm
|
||||||
|
|
||||||
|
RUN yarn config set network-timeout 600000 -g
|
||||||
|
|
||||||
# Install python database connectors
|
# Install python database connectors
|
||||||
|
|
||||||
ENTRYPOINT ["/bin/bash", "./init.sh"]
|
ENTRYPOINT ["/bin/bash", "./init.sh"]
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
services:
|
services:
|
||||||
db:
|
db:
|
||||||
image: postgres:13
|
image: postgres:15
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
expose:
|
expose:
|
||||||
- 5432/tcp
|
- 5432/tcp
|
||||||
volumes:
|
volumes:
|
||||||
- inventreedatabase:/var/lib/postgresql/data:z
|
- ../dev/psql/:/var/lib/postgresql/data:z
|
||||||
environment:
|
environment:
|
||||||
POSTGRES_DB: inventree
|
POSTGRES_DB: inventree
|
||||||
POSTGRES_USER: inventree_user
|
POSTGRES_USER: inventree_user
|
||||||
@ -40,6 +40,3 @@ services:
|
|||||||
|
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
|
|
||||||
volumes:
|
|
||||||
inventreedatabase:
|
|
||||||
|
@ -7,6 +7,19 @@ git config --global --add safe.directory /home/inventree
|
|||||||
python3 -m venv /home/inventree/dev/venv --system-site-packages --upgrade-deps
|
python3 -m venv /home/inventree/dev/venv --system-site-packages --upgrade-deps
|
||||||
. /home/inventree/dev/venv/bin/activate
|
. /home/inventree/dev/venv/bin/activate
|
||||||
|
|
||||||
|
# remove existing gitconfig created by "Avoiding Dubious Ownership" step
|
||||||
|
# so that it gets copied from host to the container to have your global
|
||||||
|
# git config in container
|
||||||
|
rm -f /home/vscode/.gitconfig
|
||||||
|
|
||||||
|
# Fix issue related to CFFI version mismatch
|
||||||
|
pip uninstall cffi -y
|
||||||
|
sudo apt remove --purge -y python3-cffi
|
||||||
|
pip install --no-cache-dir --force-reinstall --ignore-installed cffi
|
||||||
|
|
||||||
|
# Upgrade pip
|
||||||
|
python3 -m pip install --upgrade pip
|
||||||
|
|
||||||
# Ensure the correct invoke is available
|
# Ensure the correct invoke is available
|
||||||
pip3 install --ignore-installed --upgrade invoke Pillow
|
pip3 install --ignore-installed --upgrade invoke Pillow
|
||||||
|
|
||||||
@ -22,15 +35,5 @@ invoke dev.setup-dev
|
|||||||
# Install required frontend packages
|
# Install required frontend packages
|
||||||
invoke int.frontend-install
|
invoke int.frontend-install
|
||||||
|
|
||||||
# remove existing gitconfig created by "Avoiding Dubious Ownership" step
|
# Install playwright dependencies
|
||||||
# so that it gets copied from host to the container to have your global
|
cd src/frontend && sudo npx playwright install-deps
|
||||||
# git config in container
|
|
||||||
rm -f /home/vscode/.gitconfig
|
|
||||||
|
|
||||||
# Fix issue related to CFFI version mismatch
|
|
||||||
pip uninstall cffi -y
|
|
||||||
sudo apt remove --purge -y python3-cffi
|
|
||||||
pip install --no-cache-dir --force-reinstall --ignore-installed cffi
|
|
||||||
|
|
||||||
# Upgrade pip
|
|
||||||
python3 -m pip install --upgrade pip
|
|
||||||
|
Reference in New Issue
Block a user