WIP: Docker updates #13

Draft

mravi wants to merge 19 commits from docker into master

pull from: docker

merge into: ungleich-public:master

ungleich-public:master

ungleich-public:make-docker-build-succesful

ungleich-public:requirements

ungleich-public:12186-3ds

ungleich-public:recaptcha

ungleich-public:improve-logging

ungleich-public:7819/use-ascii-chars-only-for-username

ungleich-public:master-2.10.1

ungleich-public:bugfix/ldap_migration

ungleich-public:feature/old_master

ungleich-public:feature/nosystemd

ungleich-public:feature/vm_pricing

Conversation 0 Commits 19 Files changed 11 +146 -57

mravi commented 2023-05-23 07:44:51 +00:00

Owner

Copy link

No description provided.

mravi added 1 commit 2023-05-23 07:44:52 +00:00

Fix requirements b173d7d8a2

mravi added 1 commit 2023-05-23 08:10:38 +00:00

Library updates -- still fails on installing pillow 8ba6ecadf2

nico added 2 commits 2023-05-23 17:06:23 +00:00

[gitignore] ignore venv/ 179a2e6349

requirements: update some packages to newer versions ... d60032c59a

Fixing a lot of pip install issues

nico added 1 commit 2023-05-23 17:21:05 +00:00

requirements: upgrade celery (5.2.7) and friends ... 23cd61ad54

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

mravi added 4 commits 2023-05-24 01:44:57 +00:00

Remove django-celery-results and update amqp to >=5.0.9 ... 449b78c3eb

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.

Try with python 3.7 because Django 1.11 is supported by it fbeb18070b

Remove aldryn dependencies ... 792868dd64

We don't seem to be using it

Update django-cms, django-filer, django-formtools, django-treebeard, djangocms-admin-style, celery, kombu, amqp, vine to suitable versions cfffc67f55

mravi added 3 commits 2023-05-27 07:04:19 +00:00

Prepare a venv 21816e4884

Comment out celery for the moment fc6c4c2241

Update django to fix the error SyntaxError: Generator expression must be parenthesized ... e1764736fc

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

mravi added 1 commit 2023-05-27 08:43:31 +00:00

Update more dependencies; fails at no module django_celery_results 56cae7b8ab

mravi added 1 commit 2023-05-29 11:54:43 +00:00

Updates : stalled with celery ... 934c1f98de

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)

mravi added 3 commits 2023-05-30 03:57:35 +00:00

Update Dockerfile 10c3c2381c

Rename celery.py to pr_celery => causing conflict in names c52dff2c10

Add missing importlib_metadata dependency 2679c2ddd5

mravi added 2 commits 2023-07-31 08:31:23 +00:00

Add docker-compose.yml 61d41a2879

Changes to get the server up and running 50e47d5961

This pull request has changes conflicting with the target branch.

• Dockerfile
• entrypoint.sh
• requirements.txt

View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin docker:docker

git switch docker

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master

git merge --no-ff docker

git switch docker

git rebase master

git switch master

git merge --ff-only docker

git switch docker

git rebase master

git switch master

git merge --no-ff docker

git switch master

git merge --squash docker

git switch master

git merge --ff-only docker

git switch master

git merge docker

git push origin master

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

bug

  

come back to it later

  

duplicate

  

enhancement

  

help wanted

  

invalid

  

needs a review

  

needs to be tested

  

question

  

ready for testing

  

wontfix

  

work in progress

No labels

bug

come back to it later

duplicate

enhancement

help wanted

invalid

needs a review

needs to be tested

question

ready for testing

wontfix

work in progress

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

2 participants

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

ungleich-public/dynamicweb!13

No description provided.