Compare commits

...
Sign in to create a new pull request.

19 commits

Author SHA1 Message Date
PCoder
50e47d5961 Changes to get the server up and running 2023-07-31 08:30:24 +00:00
PCoder
61d41a2879 Add docker-compose.yml 2023-07-31 05:11:05 +00:00
PCoder
2679c2ddd5 Add missing importlib_metadata dependency 2023-05-30 03:57:13 +00:00
PCoder
c52dff2c10 Rename celery.py to pr_celery => causing conflict in names 2023-05-30 03:56:46 +00:00
PCoder
10c3c2381c Update Dockerfile 2023-05-30 03:55:09 +00:00
PCoder
934c1f98de Updates : stalled with celery
alpine:~/dynamicweb# docker run -ti dynamicweb:latest
Unhandled exception in thread started by <function check_errors.<locals>.wrapper at 0x7f9ede435cb0>
Traceback (most recent call last):
  File "/venv/lib/python3.7/site-packages/django/utils/autoreload.py", line 228, in wrapper
    fn(*args, **kwargs)
  File "/venv/lib/python3.7/site-packages/django/core/management/commands/runserver.py", line 116, in inner_run
    autoreload.raise_last_exception()
  File "/venv/lib/python3.7/site-packages/django/utils/autoreload.py", line 251, in raise_last_exception
    six.reraise(*_exception)
  File "/venv/lib/python3.7/site-packages/django/utils/six.py", line 685, in reraise
    raise value.with_traceback(tb)
  File "/venv/lib/python3.7/site-packages/django/utils/autoreload.py", line 228, in wrapper
    fn(*args, **kwargs)
  File "/venv/lib/python3.7/site-packages/django/__init__.py", line 27, in setup
    apps.populate(settings.INSTALLED_APPS)
  File "/venv/lib/python3.7/site-packages/django/apps/registry.py", line 108, in populate
    app_config.import_models()
  File "/venv/lib/python3.7/site-packages/django/apps/config.py", line 202, in import_models
    self.models_module = import_module(models_module_name)
  File "/usr/local/lib/python3.7/importlib/__init__.py", line 127, in import_module
    return _bootstrap._gcd_import(name[level:], package, level)
  File "<frozen importlib._bootstrap>", line 1006, in _gcd_import
  File "<frozen importlib._bootstrap>", line 983, in _find_and_load
  File "<frozen importlib._bootstrap>", line 967, in _find_and_load_unlocked
  File "<frozen importlib._bootstrap>", line 677, in _load_unlocked
  File "<frozen importlib._bootstrap_external>", line 728, in exec_module
  File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
  File "/app/opennebula_api/models.py", line 11, in <module>
    from utils.tasks import save_ssh_key, save_ssh_key_error_handler
  File "/app/utils/tasks.py", line 5, in <module>
    from celery.result import AsyncResult
  File "/venv/lib/python3.7/site-packages/celery/result.py", line 14, in <module>
    from . import current_app, states
ImportError: cannot import name 'current_app' from 'celery' (/venv/lib/python3.7/site-packages/celery/__init__.py)
2023-05-29 11:53:55 +00:00
PCoder
56cae7b8ab Update more dependencies; fails at no module django_celery_results 2023-05-27 08:43:22 +00:00
PCoder
e1764736fc Update django to fix the error SyntaxError: Generator expression must be parenthesized
alpine:~/dynamicweb# docker run -ti dynamicweb:latest
Unhandled exception in thread started by <function check_errors.<locals>.wrapper at 0x7fdc22767710>
Traceback (most recent call last):
  File "/venv/lib/python3.7/site-packages/django/utils/autoreload.py", line 227, in wrapper
    fn(*args, **kwargs)
  File "/venv/lib/python3.7/site-packages/django/core/management/commands/runserver.py", line 117, in inner_run
    autoreload.raise_last_exception()
  File "/venv/lib/python3.7/site-packages/django/utils/autoreload.py", line 250, in raise_last_exception
    six.reraise(*_exception)
  File "/venv/lib/python3.7/site-packages/django/utils/six.py", line 685, in reraise
    raise value.with_traceback(tb)
  File "/venv/lib/python3.7/site-packages/django/utils/autoreload.py", line 227, in wrapper
    fn(*args, **kwargs)
  File "/venv/lib/python3.7/site-packages/django/__init__.py", line 27, in setup
    apps.populate(settings.INSTALLED_APPS)
  File "/venv/lib/python3.7/site-packages/django/apps/registry.py", line 85, in populate
    app_config = AppConfig.create(entry)
  File "/venv/lib/python3.7/site-packages/django/apps/config.py", line 94, in create
    module = import_module(entry)
  File "/usr/local/lib/python3.7/importlib/__init__.py", line 127, in import_module
    return _bootstrap._gcd_import(name[level:], package, level)
  File "<frozen importlib._bootstrap>", line 1006, in _gcd_import
  File "<frozen importlib._bootstrap>", line 983, in _find_and_load
  File "<frozen importlib._bootstrap>", line 967, in _find_and_load_unlocked
  File "<frozen importlib._bootstrap>", line 677, in _load_unlocked
  File "<frozen importlib._bootstrap_external>", line 728, in exec_module
  File "<frozen importlib._bootstrap>", line 219, in _call_with_frames_removed
  File "/venv/lib/python3.7/site-packages/django/contrib/admin/__init__.py", line 4, in <module>
    from django.contrib.admin.filters import (
  File "/venv/lib/python3.7/site-packages/django/contrib/admin/filters.py", line 10, in <module>
    from django.contrib.admin.options import IncorrectLookupParameters
  File "/venv/lib/python3.7/site-packages/django/contrib/admin/options.py", line 12, in <module>
    from django.contrib.admin import helpers, widgets
  File "/venv/lib/python3.7/site-packages/django/contrib/admin/widgets.py", line 151
    '%s=%s' % (k, v) for k, v in params.items(),
    ^
SyntaxError: Generator expression must be parenthesized
2023-05-27 07:03:23 +00:00
PCoder
fc6c4c2241 Comment out celery for the moment 2023-05-27 07:02:19 +00:00
PCoder
21816e4884 Prepare a venv 2023-05-27 07:01:39 +00:00
PCoder
cfffc67f55 Update django-cms, django-filer, django-formtools, django-treebeard, djangocms-admin-style, celery, kombu, amqp, vine to suitable versions 2023-05-24 01:44:38 +00:00
PCoder
792868dd64 Remove aldryn dependencies
We don't seem to be using it
2023-05-24 01:43:03 +00:00
PCoder
fbeb18070b Try with python 3.7 because Django 1.11 is supported by it 2023-05-24 01:42:14 +00:00
PCoder
449b78c3eb Remove django-celery-results and update amqp to >=5.0.9
New error:
Traceback (most recent call last):
  File "/app/manage.py", line 10, in <module>
    execute_from_command_line(sys.argv)
  File "/usr/local/lib/python3.10/site-packages/django/core/management/__init__.py", line 353, in execute_from_command_line
    utility.execute()
  File "/usr/local/lib/python3.10/site-packages/django/core/management/__init__.py", line 302, in execute
    settings.INSTALLED_APPS
  File "/usr/local/lib/python3.10/site-packages/django/conf/__init__.py", line 55, in __getattr__
    self._setup(name)
  File "/usr/local/lib/python3.10/site-packages/django/conf/__init__.py", line 43, in _setup
    self._wrapped = Settings(settings_module)
  File "/usr/local/lib/python3.10/site-packages/django/conf/__init__.py", line 99, in __init__
    mod = importlib.import_module(self.SETTINGS_MODULE)
  File "/usr/local/lib/python3.10/importlib/__init__.py", line 126, in import_module
    return _bootstrap._gcd_import(name[level:], package, level)
  File "<frozen importlib._bootstrap>", line 1050, in _gcd_import
  File "<frozen importlib._bootstrap>", line 1027, in _find_and_load
  File "<frozen importlib._bootstrap>", line 992, in _find_and_load_unlocked
  File "<frozen importlib._bootstrap>", line 241, in _call_with_frames_removed
  File "<frozen importlib._bootstrap>", line 1050, in _gcd_import
  File "<frozen importlib._bootstrap>", line 1027, in _find_and_load
  File "<frozen importlib._bootstrap>", line 1006, in _find_and_load_unlocked
  File "<frozen importlib._bootstrap>", line 688, in _load_unlocked
  File "<frozen importlib._bootstrap_external>", line 883, in exec_module
  File "<frozen importlib._bootstrap>", line 241, in _call_with_frames_removed
  File "/app/dynamicweb/__init__.py", line 3, in <module>
    from .celery import app as celery_app
  File "/app/dynamicweb/celery.py", line 7, in <module>
    app = Celery('dynamicweb')
  File "/usr/local/lib/python3.10/site-packages/celery/app/base.py", line 291, in __init__
    self._fixups = [symbol_by_name(fixup)(self) for fixup in self.fixups]
  File "/usr/local/lib/python3.10/site-packages/celery/app/base.py", line 291, in <listcomp>
    self._fixups = [symbol_by_name(fixup)(self) for fixup in self.fixups]
  File "/usr/local/lib/python3.10/site-packages/celery/fixups/django.py", line 44, in fixup
    _verify_django_version(django)
  File "/usr/local/lib/python3.10/site-packages/celery/fixups/django.py", line 32, in _verify_django_version
    raise ImproperlyConfigured('Celery 5.x requires Django 1.11 or later.')
celery.exceptions.ImproperlyConfigured: Celery 5.x requires Django 1.11 or later.
2023-05-23 17:40:12 +00:00
Nico Schottelius
23cd61ad54 requirements: upgrade celery (5.2.7) and friends
Failing with:

The conflict is caused by:
    The user requested Django==1.9.4
    aldryn-boilerplates 0.7.4 depends on Django<1.9.999 and >=1.5
    aldryn-categories 1.0.3 depends on django<1.10 and >=1.6
    aldryn-newsblog 1.2.1 depends on Django<1.10 and >=1.6
    aldryn-people 1.2.0 depends on Django<1.10 and >=1.6
    aldryn-reversion 1.0.8 depends on Django<1.10 and >=1.6
    aldryn-search 0.2.11 depends on Django>=1.4
    cmsplugin-filer 1.0.1 depends on Django>=1.5
    django-appdata 0.1.5 depends on Django>=1.4.10
    django-classy-tags 0.7.2 depends on Django>1.3
    django-cms 3.2.5 depends on Django<1.10 and >=1.6.9
    django-debug-toolbar 1.4 depends on Django>=1.7
    django-filer 1.2.0 depends on Django<1.9.999 and >=1.5
    django-formtools 1.0 depends on Django>=1.7
    django-guardian 1.4.4 depends on Django>=1.7
    django-haystack 2.4.1 depends on Django
    django-model-utils 2.5 depends on Django>=1.4.2
    django-mptt 0.8.4 depends on Django>=1.8
    django-reversion 1.10.2 depends on django>=1.8
    django-standard-form 1.1.1 depends on Django>=1.3
    django-stored-messages 1.4.0 depends on Django>=1.8
    django-taggit-templatetags 0.2.5 depends on django>=1.1
    django-treebeard 4.0.1 depends on Django>=1.7
    djangocms-picture 1.0.0 depends on django>=1.6
    easy-thumbnails 2.3 depends on django>=1.4.2
    model-mommy 1.2.6 depends on Django
    django-celery-results 2.5.1 depends on Django>=3.2.18
2023-05-23 19:20:44 +02:00
Nico Schottelius
d60032c59a requirements: update some packages to newer versions
Fixing a lot of pip install issues
2023-05-23 19:05:57 +02:00
Nico Schottelius
179a2e6349 [gitignore] ignore venv/ 2023-05-23 19:05:15 +02:00
PCoder
8ba6ecadf2 Library updates -- still fails on installing pillow 2023-05-23 08:10:26 +00:00
PCoder
b173d7d8a2 Fix requirements 2023-05-19 13:42:32 +00:00
11 changed files with 146 additions and 57 deletions

1
.gitignore vendored
View file

@ -15,6 +15,7 @@ media/
!media/keep
/CACHE/
/static/
/venv/
\#*#
.\#*

View file

@ -1,6 +1,8 @@
FROM python:3.10.0-alpine3.15
FROM python:3.7-alpine3.15
WORKDIR /usr/src/app
WORKDIR /app
COPY . /app/
RUN apk add --update --no-cache \
git \
@ -8,11 +10,35 @@ RUN apk add --update --no-cache \
openldap-dev \
python3-dev \
libpq-dev \
libjpeg \
libmemcached-dev \
libxml2-dev \
libxslt-dev \
zlib \
jpeg-dev \
zlib-dev \
&& rm -rf /var/cache/apk/*
# FIX https://github.com/python-ldap/python-ldap/issues/432
RUN echo 'INPUT ( libldap.so )' > /usr/lib/libldap_r.so
COPY requirements.txt ./
#RUN LIBRARY_PATH=/lib:/usr/lib /bin/sh -c "pip install --no-cache-dir -r requirements.txt"
# Create a virtual environment
RUN python3 -m venv /venv
ENV PATH="/venv/bin:$PATH"
RUN pip install --no-cache-dir --upgrade pip
#RUN CFLAGS="-Wno-cpp -Wno-unused-function -Wno-unused-variable -Wno-missing-noreturn -I/usr/include/libxml2" pip install lxml
RUN pip install --no-cache-dir -r requirements.txt
COPY ./ .
# Copy entrypoint.sh script and grant execute permissions
COPY entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
# Run migrations and start the server
ENTRYPOINT ["/entrypoint.sh"]

View file

@ -9,7 +9,7 @@ from django.core.urlresolvers import reverse
from django.utils import translation
from django.utils.translation import ugettext_lazy as _
from dynamicweb.celery import app
from dynamicweb.pr_celery import app
from hosting.models import HostingOrder
from membership.models import CustomUser
from opennebula_api.models import OpenNebulaManager

42
docker-compose.yml Normal file
View file

@ -0,0 +1,42 @@
version: '3'
services:
# Django app service
web:
build:
context: .
dockerfile: Dockerfile
container_name: dynamicweb
command: python manage.py runserver 0.0.0.0:8000
volumes:
- .:/app
ports:
- "8000:8000"
depends_on:
- db
# PostgreSQL database service
db:
image: postgres:13
container_name: my_postgres_db
environment:
POSTGRES_USER: your_postgres_username
POSTGRES_PASSWORD: your_postgres_password
POSTGRES_DB: your_database_name
volumes:
- postgres_data:/var/lib/postgresql/data
# Nginx service
nginx:
image: nginx:latest
container_name: my_nginx_server
volumes:
- ./nginx/default.conf:/etc/nginx/conf.d/default.conf
ports:
- "80:80"
depends_on:
- web
volumes:
postgres_data:

View file

@ -1,5 +1,5 @@
# This will make sure the app is always imported when
# Django starts so that shared_task will use this app.
from .celery import app as celery_app
__all__ = ['celery_app']
#from .celery import app as celery_app
#
#__all__ = ['celery_app']

View file

@ -113,7 +113,7 @@ INSTALLED_APPS = (
'aldryn_common',
'aldryn_newsblog',
'aldryn_people',
'aldryn_reversion',
#'aldryn_reversion',
'aldryn_translation_tools',
'treebeard', # utilities for implementing a tree
'sekizai', # for javascript and css management
@ -156,7 +156,7 @@ INSTALLED_APPS = (
'webhook',
)
MIDDLEWARE_CLASSES = (
MIDDLEWARE = (
'django.contrib.sessions.middleware.SessionMiddleware',
'utils.middleware.MultipleProxyMiddleware',
'django.middleware.common.CommonMiddleware',
@ -239,8 +239,12 @@ CMS_TEMPLATES = (
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql_psycopg2',
'NAME': 'app',
'ENGINE': 'django.db.backends.postgresql',
'NAME': 'your_database_name',
'USER': 'your_postgres_username',
'PASSWORD': 'your_postgres_password',
'HOST': 'db',
'PORT': '5432'
}
}

View file

@ -15,7 +15,7 @@ CACHES = {
}
}
MIDDLEWARE_CLASSES += ("debug_toolbar.middleware.DebugToolbarMiddleware",)
MIDDLEWARE += ("debug_toolbar.middleware.DebugToolbarMiddleware",)
INSTALLED_APPS += (
'django_extensions',

15
entrypoint.sh Normal file
View file

@ -0,0 +1,15 @@
#!/bin/sh
# Wait for the database to be available
while ! nc -z db 5432; do
sleep 0.1
done
# Apply database migrations
python manage.py migrate
# Collect static files
python manage.py collectstatic --no-input
# Start the server
python manage.py runserver 0.0.0.0:8000

View file

@ -1,56 +1,57 @@
setuptools<58.0.0
Babel==2.3.4
Django==1.9.4
Django==1.11.18
Django-Select2==4.3.2
Pillow==3.2.0
Pillow==9.5.0
URLObject==2.4.0
Unidecode==0.04.19
Unidecode==1.0.23
YURL==0.13
aldryn-apphooks-config==0.2.7
aldryn-boilerplates==0.7.4
aldryn-categories==1.0.3
aldryn-common==1.0.1
aldryn-newsblog==1.2.1
aldryn-people==1.2.0
aldryn-reversion==1.0.8
#aldryn-apphooks-config==0.2.7
#aldryn-boilerplates==0.7.4
aldryn-categories==1.2.0
aldryn-common==1.0.5
aldryn-newsblog==2.2.1
aldryn-people==2.2.0
#aldryn-reversion==1.0.8
aldryn-search==0.2.11
aldryn-translation-tools==0.2.1
aldryn-translation-tools==0.3.0
backport-collections==0.1
cmsplugin-filer==1.0.1
#cmsplugin-filer==1.1.3
django-appconf==1.0.2
django-appdata==0.1.5
django-appdata==0.2.1
django-bootstrap3==7.0.1
django-classy-tags==0.7.2
django-cms==3.2.5
django-cms==3.6.0
django-compressor==2.0
django-debug-toolbar==1.4
python-dotenv==0.10.3
django-extensions==1.6.7
django-filer==2.1.2
django-filer==1.5.0
django-filter==0.13.0
django-formtools==1.0
django-formtools==2.1
django-guardian==1.4.4
django-haystack==2.4.1
django-meta==1.2
django-meta-mixin==0.3.0
django-model-utils==2.5
django-mptt==0.8.4
django-parler==1.6.3
django-mptt==0.11
django-parler==1.9.2
django-phonenumber-field==1.1.0
django-polymorphic==0.9.2
django-polymorphic==2.0.2
django-reversion==1.10.2
django-sekizai==0.9.0
django-sortedm2m==1.2.2
django-sortedm2m==3.1.1
django-spurl==0.6.4
django-standard-form==1.1.1
django-stored-messages==1.4.0
django-taggit==0.18.3
django-taggit==0.23.0
django-taggit-autosuggest==0.2.8
django-taggit-templatetags==0.2.5
django-templatetag-sugar==1.0
django-treebeard==4.0.1
djangocms-admin-style==1.1.1
django-treebeard==4.3
djangocms-admin-style>=1.2
djangocms-apphook-setup==0.1.2
djangocms-blog==0.9.0
djangocms-blog==0.8.13
djangocms-file==1.0
djangocms-flash==0.3.0
djangocms-googlemap==0.4.0
@ -59,26 +60,25 @@ djangocms-link==1.7.2
djangocms-page-meta==0.5.11
djangocms-picture==1.0.0
djangocms-teaser==0.2.0
djangocms-text-ckeditor==2.9.3
djangocms-text-ckeditor==3.7.0
djangocms-video==1.0.0
easy-thumbnails==2.3
html5lib==0.9999999
easy-thumbnails==2.4.1
html5lib==0.999999999
ldap3==2.6.1
lxml==3.6.0
lxml
model-mommy==1.2.6
phonenumbers==7.4.0
phonenumberslite==7.4.0
psycopg2==2.7.3.2
pycryptodome==3.6.6
pylibmc==1.5.1
phonenumbers==8.13.11
psycopg2==2.8.4
pycryptodome==3.8.0
pylibmc==1.6.3
python-dateutil==2.5.3
python-slugify==1.2.0
pytz==2016.4
python-slugify==1.2.6
pytz>=2023.3
rcssmin==1.0.6
requests==2.10.0
requests>=2.20
rjsmin==1.0.12
six==1.10.0
sqlparse==0.1.19
sqlparse==0.4.4
stripe==2.41.0
wheel==0.29.0
django-admin-honeypot==1.0.0
@ -87,16 +87,17 @@ git+https://github.com/ungleich/python-oca.git#egg=oca
djangorestframework==3.6.3
flake8==3.3.0
python-memcached==1.58
celery==4.0.2
celery==4.4.7
redis==2.10.5
django-celery-results==1.0.1
kombu==4.1.0
django-celery-results==1.0.2
kombu>=4.6.10
mccabe==0.6.1
pycodestyle==2.3.1
pyflakes==1.5.0
billiard==3.5.0.3
amqp==2.2.1
vine==1.1.4
billiard==3.6.4.0
amqp>=2.6.0
vine==1.3.0
cdist==5.0.1
git+https://github.com/ungleich/djangocms-multisite.git#egg=djangocms_multisite
pyotp
importlib_metadata<5

View file

@ -8,7 +8,7 @@ from celery.utils.log import get_task_logger
from django.conf import settings
from django.core.mail import EmailMessage
from dynamicweb.celery import app
from dynamicweb.pr_celery import app
logger = get_task_logger(__name__)