Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update docker compose #256

Merged
merged 15 commits into from
Aug 21, 2022
Merged

Conversation

dimasciput
Copy link
Collaborator

No description provided.

@Gustry
Copy link
Contributor

Gustry commented Aug 21, 2022

Nice to take care of that !
Should I close my PR #233 ?

@dimasciput
Copy link
Collaborator Author

@Gustry

Nice to take care of that ! Should I close my PR #233 ?

No I don't think so, since this is only updating the docker-compose configuration.

@codecov-commenter
Copy link

Codecov Report

Merging #256 (ec481b1) into master (f851253) will increase coverage by 37.01%.
The diff coverage is 73.84%.

@@             Coverage Diff             @@
##           master     #256       +/-   ##
===========================================
+ Coverage   37.70%   74.71%   +37.01%     
===========================================
  Files          87      126       +39     
  Lines        3684     4746     +1062     
===========================================
+ Hits         1389     3546     +2157     
+ Misses       2295     1200     -1095     
Impacted Files Coverage Δ
qgis-app/plugins/views.py 21.55% <51.72%> (+2.94%) ⬆️
qgis-app/plugins/tasks/update_feedjack.py 66.66% <66.66%> (ø)
qgis-app/plugins/tasks/generate_plugins_xml.py 32.14% <75.00%> (+4.14%) ⬆️
qgis-app/plugins/celery.py 100.00% <100.00%> (+11.11%) ⬆️
qgis-app/plugins/tasks/__init__.py 100.00% <100.00%> (ø)
qgis-app/plugins/tests/test_view.py 100.00% <100.00%> (ø)
qgis-app/settings_docker.py 100.00% <100.00%> (ø)
qgis-app/styles/forms.py 96.29% <0.00%> (ø)
qgis-app/homepage.py 42.85% <0.00%> (ø)
qgis-app/lib/templatetags/sort_anchor.py 22.44% <0.00%> (ø)
... and 66 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@dimasciput dimasciput changed the base branch from master to update_stacks August 21, 2022 13:30
@dimasciput dimasciput merged commit d4c8550 into qgis:update_stacks Aug 21, 2022
dimasciput added a commit that referenced this pull request May 6, 2024
* Upgrade the stack from Django 2.2 to 3.2 (#233)

* Upgrade the stack from Django 2.2 to 3.2

* Upgrade pip as well when installing

Co-authored-by: Dimas Ciputra <dimas.ciputra@gmail.com>

* Update docker compose (#256)

* Fix min_qg_version query in plugins.xml (#224)

* fix min_qg_version query

* added 0 patch value for qgis version against max_qg_version

* only add patch if it has major.minor version

* Update docker-compose and dockerfile

* Update nginx configuration

* Update smtp

* Add celery beat

* Add feedjack update celery task

* Add metabase configuration

* Update test.yaml

* Add test docker-compose

Co-authored-by: sumandari <sumandari@kartoza.com>

* Fix docker-compose and dockerfile

* Init starting docker dev environment

* Fixing docker container conflict, updating whoosh

* Update testfiles and feedback test

* Update dockerfile for dev and prod

* Use main branch for whoosh in requirements

* Django 4 update: Requirements, dockerfile and docker-compose

* Django 4 update: fixes for ifequal, ugettext_lazy, django.conf.urls.url occurences

* Django 4 update: Fix deprecated readfp

* Django 4 update: update dbrestore in Makefile

* Django 4 update: Get static, media and backup volumes from the environment variable

* Django 4 update: Use solr thumbnail default engine

* Django 4 update: Fix Django warnings

* Django 4 update: fix depecated tests, new migrations

* Django 4 update: Update django unit tests

* Django 4 update: Add email environment variables

* Django 4 update: Nginx and uwsgi updates

* Django 4 update: Refactoring dockerfile

* Update makefile to use new docker compose

* Django 4 update: Specify devweb container_name, fix typo

* Use existing nginx configuration

* Add DEFAULT_PLUGINS_SITE to environment variables

* Add nginx dev and prod configuration files

* Django 4 update: Generate a .env file in GH actions

* Django 4 update: Fix typo in Makefile

* Django 4 update: Use updated docker compose in test.yaml

* Django 4 update: Certbot service and SSL configuration

* Add a http configuration for Nginx

* Django 4 update: add SSL cert renewal script

* Redirect http to https

---------

Co-authored-by: Étienne Trimaille <gustrimaille@yahoo.fr>
Co-authored-by: Dimas Ciputra <dimas.ciputra@gmail.com>
Co-authored-by: sumandari <sumandari@kartoza.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants