diff --git a/INSTALL.md b/INSTALL.md index 7cbcfe23..74180db7 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,6 +1,6 @@ # Installation -## Development Environment Deployment +## Development Environment - Clone git repo `git clone https://github.com/qgis/QGIS-Django.git` - Run `$ pwd` in order to get your current directory @@ -45,8 +45,12 @@ This command ensures that the search index accurately reflects the current state For more information about make commands, please see the full docs [here](./dockerize/README.md). +## Production Environment +For the production environment, please see the the private repo of the System Administration Documentation. + --- + ### Setup git-hooks and local linting In the root directory of the repo, run: @@ -194,27 +198,3 @@ $ cd dockerize $ make dbrestore ``` ---- - -## Deploy Update with Rancher - -**TO BE DEPRECATED** - -- Go to [https://rancher.qgis.org](https://rancher.qgis.org) -- Click the home icon in the top left corner, and choose the environment: `plugins.qgis.org` -- You will be redirected to User Stacks page, choose the plugins stack by clicking on `plugins` link -- Next, let's go inside the container, click on `uwsgi` link. - - ![image](https://user-images.githubusercontent.com/178003/99949715-65f55d00-2d73-11eb-929c-966a7b2877a7.png) - -- In Containers tab, click on tripe-dot icon > `Execute Shell` - - ![image](https://user-images.githubusercontent.com/40058076/102454128-7352ee00-4078-11eb-80aa-f782c6ea9f6f.png) - - Now you are inside the container and ready to deploy your update. - - ![image](https://user-images.githubusercontent.com/40058076/102455185-1ce6af00-407a-11eb-8318-3e084b24c095.png) -- Pull the latest commit: `git pull origin master` -- Run migration: `python manage.py migrate` -- Run collectstatic: `python manage.py collectstatic` -- Reload uwsgi: `uwsgi --reload /tmp/django.pid` diff --git a/img/Docker_Services.png b/img/Docker_Services.png new file mode 100644 index 00000000..32a0c5e8 Binary files /dev/null and b/img/Docker_Services.png differ diff --git a/readme.md b/readme.md index 56f730e2..d6092e05 100644 --- a/readme.md +++ b/readme.md @@ -12,8 +12,6 @@ For licensing information, please read the COPYING file included in this directo For setup, installation and backup notes, please read [INSTALL](INSTALL.md) included in this directory. -For setting up a local development environment using Vagrant please read the Vagrant [README](vagrant_assets/README.md). - To contribute to this project, please contact Tim Sutton - tim@kartoza.com @@ -22,14 +20,14 @@ Tim Sutton 2010 ## Admin -To update QGIS versions, go to **[Admin](https://plugins.qgis.org/admin/)** -> **[Site preferences](https://plugins.qgis.org/admin/preferences/sitepreference/)**. +QGIS versions are updated automatically from a scheduled task. To update QGIS versions manually, go to **[Admin](https://plugins.qgis.org/admin/)** -> **[Site preferences](https://plugins.qgis.org/admin/preferences/sitepreference/)**. ## Tech stack -![image](https://user-images.githubusercontent.com/178003/91535744-8c8a3000-e90b-11ea-8ca3-b6ce1bb910bd.png) +![image](./img/Docker_Services.png) -This application is based on Django, written in python and deployed on the server using -docker and rancher. +This application is based on Django, written in Python and deployed on the server using +docker-compose. ## Token based authentication