Merge branch 'v4.x' of https://gitlab.com/allianceauth/allianceauth into v4-bumps

docker/.env.example

@@ -1,7 +1,7 @@
 PROTOCOL=https://
 AUTH_SUBDOMAIN=%AUTH_SUBDOMAIN%
 DOMAIN=%DOMAIN%
-AA_DOCKER_TAG=registry.gitlab.com/allianceauth/allianceauth/auth:v3.1.1
+AA_DOCKER_TAG=registry.gitlab.com/allianceauth/allianceauth/auth:v3.4.0
 
 # Nginx Proxy Manager
 PROXY_HTTP_PORT=80

docker/README.md

@@ -49,7 +49,11 @@ Using a custom docker image is the preferred approach, as it gives you the stabi
 
 1. Add each additional package that you want to install to a single line in `conf/requirements.txt`. It is recommended, but not required, that you include a version number as well. This will keep your packages from magically updating. You can lookup packages on https://package.wiki, and copy everything after `pip install` from the top of the page to use the most recent version. It should look something like `allianceauth-signal-pings==0.0.7`. Every entry in this file should be on a separate line
 1. In `docker-compose.yml`, comment out the `image` line under `allianceauth` (line 36... ish) and uncomment the `build` section
-1. Now run `docker-compose --env-file=.env up -d`, your custom container will be built, and auth will have your new packages. Make sure to follow the package's instructions on config values that go in `local.py`
+1. run `docker-compose --env-file=.env up -d`, your custom container will be built, and auth will have your new packages. Make sure to follow the package's instructions on config values that go in `local.py`
+1. run `docker-compose exec allianceauth bash` to open up a terminal inside your auth container
+1. run `allianceauth update myauth`
+1. run `auth migrate`
+1. run `auth collectstatic`
 
 _NOTE: It is recommended that you put any secret values (API keys, database credentials, etc) in an environment variable instead of hardcoding them into `local.py`. This gives you the ability to track your config in git without committing passwords. To do this, just add it to your `.env` file, and then reference in `local.py` with `os.environ.get("SECRET_NAME")`_
 
@@ -58,8 +62,12 @@ _NOTE: It is recommended that you put any secret values (API keys, database cred
 ### Base Image
 Whether you're using a custom image or not, the version of auth is dictated by $AA_DOCKER_TAG in your `.env` file.
 1. To update to a new version of auth, update the version number at the end (or replace the whole value with the tag in the release notes).
-1. Next, run `docker-compose pull`
-1. Finally, run `docker-compose --env-file=.env up -d`
+1. run `docker-compose pull`
+1. run `docker-compose --env-file=.env up -d`
+1. run `docker-compose exec allianceauth bash` to open up a terminal inside your auth container
+1. run `allianceauth update myauth`
+1. run `auth migrate`
+1. run `auth collectstatic`
 
 _NOTE: If you specify a version of allianceauth in your `requirements.txt` in a custom image it will override the version from the base image. Not recommended unless you know what you're doing_
 

docker/conf/local.py

@@ -28,7 +28,9 @@ DATABASES["default"] = {
 ESI_SSO_CLIENT_ID = os.environ.get("ESI_SSO_CLIENT_ID")
 ESI_SSO_CLIENT_SECRET = os.environ.get("ESI_SSO_CLIENT_SECRET")
 ESI_SSO_CALLBACK_URL = f"{SITE_URL}/sso/callback"
-ESI_USER_CONTACT_EMAIL = os.environ.get("ESI_USER_CONTACT_EMAIL")  # A server maintainer that CCP can contact in case of issues.
+ESI_USER_CONTACT_EMAIL = os.environ.get(
+    "ESI_USER_CONTACT_EMAIL"
+)  # A server maintainer that CCP can contact in case of issues.
 
 # By default emails are validated before new users can log in.
 # It's recommended to use a free service like SparkPost or Elastic Email to send email.
@@ -48,7 +50,6 @@ ROOT_URLCONF = "myauth.urls"
 WSGI_APPLICATION = "myauth.wsgi.application"
 STATIC_ROOT = "/var/www/myauth/static/"
 BROKER_URL = f"redis://{os.environ.get('AA_REDIS', 'redis:6379')}/0"
-CELERY_RESULT_BACKEND = f"redis://{os.environ.get('AA_REDIS', 'redis:6379')}/0"
 CACHES = {
     "default": {
         "BACKEND": "django_redis.cache.RedisCache",
@@ -66,11 +67,15 @@ INSTALLED_APPS += [
     # 'allianceauth.permissions_tool',
     # 'allianceauth.srp',
     # 'allianceauth.timerboard',
+
     # https://allianceauth.readthedocs.io/en/latest/features/services/index.html
     # 'allianceauth.services.modules.discord',
     # 'allianceauth.services.modules.discourse',
     # 'allianceauth.services.modules.ips4',
     # 'allianceauth.services.modules.openfire',
+    # 'allianceauth.services.modules.mumble',
+    # An example of running mumble with authenticator in docker can be found here
+    # https://github.com/Solar-Helix-Independent-Transport/allianceauth-docker-mumble
     # 'allianceauth.services.modules.phpbb3',
     # 'allianceauth.services.modules.smf',
     # 'allianceauth.services.modules.teamspeak3',

docker/custom.dockerfile

@@ -4,5 +4,3 @@ FROM $AA_DOCKER_TAG
 RUN cd /home/allianceauth
 COPY /conf/requirements.txt requirements.txt
 RUN pip install -r requirements.txt
-RUN python $AUTH_HOME/myauth/manage.py collectstatic --noinput
-RUN allianceauth update myauth