From 38ca3074f6a9b882306c0ad3effbbf972fcb52ea Mon Sep 17 00:00:00 2001 From: Sam Arbid Date: Tue, 10 Dec 2024 13:26:33 +0100 Subject: [PATCH 1/2] docker: add IIF_CACHE_REDIS_URL to configuration --- {{cookiecutter.project_shortname}}/docker-services.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/{{cookiecutter.project_shortname}}/docker-services.yml b/{{cookiecutter.project_shortname}}/docker-services.yml index 0dd5a70..c6f1c3c 100644 --- a/{{cookiecutter.project_shortname}}/docker-services.yml +++ b/{{cookiecutter.project_shortname}}/docker-services.yml @@ -10,6 +10,7 @@ services: - "INVENIO_ACCOUNTS_SESSION_REDIS_URL=redis://cache:6379/1" - "INVENIO_BROKER_URL=amqp://guest:guest@mq:5672/" - "INVENIO_CACHE_REDIS_URL=redis://cache:6379/0" + - "INVENIO_IIIF_CACHE_REDIS_URL=redis://cache:6379/0" - "INVENIO_CACHE_TYPE=redis" - "INVENIO_CELERY_BROKER_URL=amqp://guest:guest@mq:5672/" - "INVENIO_CELERY_RESULT_BACKEND=redis://cache:6379/2" From ba36af737bab481ab0612f0a819dbc27c42efc13 Mon Sep 17 00:00:00 2001 From: Sam Arbid Date: Tue, 10 Dec 2024 13:30:10 +0100 Subject: [PATCH 2/2] docker: rearrange and group vars --- {{cookiecutter.project_shortname}}/docker-services.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/{{cookiecutter.project_shortname}}/docker-services.yml b/{{cookiecutter.project_shortname}}/docker-services.yml index c6f1c3c..54dbe65 100644 --- a/{{cookiecutter.project_shortname}}/docker-services.yml +++ b/{{cookiecutter.project_shortname}}/docker-services.yml @@ -7,13 +7,14 @@ services: image: {{cookiecutter.project_shortname}} restart: "unless-stopped" environment: - - "INVENIO_ACCOUNTS_SESSION_REDIS_URL=redis://cache:6379/1" - "INVENIO_BROKER_URL=amqp://guest:guest@mq:5672/" + - "INVENIO_CELERY_BROKER_URL=amqp://guest:guest@mq:5672/" + - "INVENIO_CACHE_TYPE=redis" - "INVENIO_CACHE_REDIS_URL=redis://cache:6379/0" - "INVENIO_IIIF_CACHE_REDIS_URL=redis://cache:6379/0" - - "INVENIO_CACHE_TYPE=redis" - - "INVENIO_CELERY_BROKER_URL=amqp://guest:guest@mq:5672/" + - "INVENIO_ACCOUNTS_SESSION_REDIS_URL=redis://cache:6379/1" - "INVENIO_CELERY_RESULT_BACKEND=redis://cache:6379/2" + - "INVENIO_RATELIMIT_STORAGE_URL=redis://cache:6379/3" - "INVENIO_COMMUNITIES_IDENTITIES_CACHE_REDIS_URL=redis://cache:6379/4" - "INVENIO_SEARCH_HOSTS=['search:9200']" - "INVENIO_SECRET_KEY=CHANGE_ME" @@ -23,7 +24,6 @@ services: - "INVENIO_SQLALCHEMY_DATABASE_URI=mysql+pymysql://{{cookiecutter.project_shortname}}:{{cookiecutter.project_shortname}}@db/{{cookiecutter.project_shortname}}" {%- endif %} - "INVENIO_WSGI_PROXIES=2" - - "INVENIO_RATELIMIT_STORAGE_URL=redis://cache:6379/3" frontend: build: ./docker/nginx/ image: {{cookiecutter.project_shortname}}-frontend