updated docker, dependencies

This commit is contained in:
Alexander Karpov 2022-12-21 00:50:36 +03:00
parent 65a02bb660
commit 3090e33550
8 changed files with 2178 additions and 2176 deletions

View File

@ -2,9 +2,11 @@
# ------------------------------------------------------------------------------
USE_DOCKER=yes
IPYTHONDIR=/app/.ipython
DJANGO_READ_DOT_ENV_FILE=no
# Redis
# ------------------------------------------------------------------------------
REDIS_URL=redis://redis:6379/0
CELERY_BROKER_URL=redis://localhost:6379/0
# Celery
# ------------------------------------------------------------------------------

View File

@ -69,11 +69,7 @@ updates:
schedule:
interval: "daily"
# Enable version updates for Python/Pip - Production
- package-ecosystem: "pip"
# Look for a `requirements.txt` in the `root` directory
# also 'setup.cfg', 'runtime.txt' and 'requirements/*.txt'
directory: "/"
# Check for updates to GitHub Actions every weekday
schedule:
interval: "daily"

View File

@ -21,19 +21,16 @@ concurrency:
jobs:
linter:
runs-on: ubuntu-latest
steps:
steps:
- name: Checkout Code Repository
uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v3
with:
python-version: "3.10"
cache: pip
cache-dependency-path: |
requirements/base.txt
requirements/local.txt
python-version: "3.11"
cache: poetry
- name: Run pre-commit
uses: pre-commit/action@v2.0.3
@ -43,7 +40,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Code Repository
uses: actions/checkout@v3
@ -58,3 +54,16 @@ jobs:
- name: Tear down the Stack
run: docker-compose -f local.yml down
build:
runs-on: ubuntu-latest
steps:
- name: Checkout Code Repository
uses: actions/checkout@v3
- name: Build the Stack
run: docker-compose -f production.yml build
- name: Tear down the Stack
run: docker-compose -f production.yml down

View File

@ -15,19 +15,6 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
# psycopg2 dependencies
libpq-dev
RUN pip install poetry==1.2.2
# Configuring poetry
RUN poetry config virtualenvs.create false
COPY pyproject.toml poetry.lock /
# Installing requirements
RUN poetry install
# Removing gcc
RUN apt-get purge -y \
gcc \
&& rm -rf /var/lib/apt/lists/*
# Python 'run' stage
FROM python as python-run-stage
@ -51,6 +38,15 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
&& rm -rf /var/lib/apt/lists/*
RUN pip install poetry
# Configuring poetry
RUN poetry config virtualenvs.create false
COPY pyproject.toml poetry.lock /
# Installing requirements
RUN poetry install
COPY ./compose/production/django/entrypoint /entrypoint
RUN sed -i 's/\r$//g' /entrypoint

View File

@ -3,6 +3,8 @@
set -o errexit
set -o nounset
python manage.py makemigrations
python manage.py migrate auth
python manage.py migrate
rm -f './celerybeat.pid'
celery -A config.celery_app beat -l INFO

View File

@ -19,20 +19,6 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
&& rm -rf /var/lib/apt/lists/*
RUN pip install poetry==1.2.2
# Configuring poetry
RUN poetry config virtualenvs.create false
COPY pyproject.toml poetry.lock /
# Installing requirements
RUN poetry install
# Removing gcc
RUN apt-get purge -y \
gcc \
&& rm -rf /var/lib/apt/lists/*
# Python 'run' stage
FROM python as python-run-stage
@ -57,6 +43,16 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
&& rm -rf /var/lib/apt/lists/*
RUN pip install poetry
# Configuring poetry
RUN poetry config virtualenvs.create false
COPY pyproject.toml poetry.lock /
# Installing requirements
RUN poetry install
COPY ./compose/local/docs/start /start-docs
RUN sed -i 's/\r$//g' /start-docs
RUN chmod +x /start-docs

4273
poetry.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -58,11 +58,11 @@ pytest-django = "^4.5.2"
gunicorn = "^20.1.0"
sentry-sdk = "^1.12.0"
django-anymail = {extras = ["mailgun"], version = "^8.6"}
psycopg2-binary = "^2.9.5"
django-polymorphic = "^3.1.0"
django-jazzmin = "^2.6.0"
django-cacheops = "^6.1"
django-extra-settings = "^0.7.0"
psycopg2-binary = "^2.9.5"
[build-system]