setup granular vars

* testing with inveniosoftware/invenio-config#57

Author: Samk13

.env

@@ -0,0 +1,27 @@
+INVENIO_DB_USER="test"
+INVENIO_DB_PASSWORD="CHANGEME"
+INVENIO_DB_HOST="localhost"
+INVENIO_DB_PORT="5432"
+INVENIO_DB_NAME="testestdb"
+INVENIO_DB_PROTOCOL="postgresql+psycopg2"
+# INVENIO_SQLALCHEMY_DATABASE_URI="postgresql+psycopg2://latest-build:latest-build@localhost/barrrrrr"
+INVENIO_SQLALCHEMY_DATABASE_URI=""
+SQLALCHEMY_DATABASE_URI=""
+
+
+# Broker
+# BROKER_URL=""
+# message queue
+INVENIO_RABBITMQ_USER="sam-test"
+INVENIO_RABBITMQ_PASSWORD="TODO-REPLACE-ME"
+
+INVENIO_RABBITMQ_HOST="localhost"
+INVENIO_RABBITMQ_PORT="5672"
+INVENIO_RABBITMQ_PROTOCOL="amqp"
+# optional
+INVENIO_RABBITMQ_VHOST=""
+
+# Redis Cache
+INVENIO_REDIS_PORT="6379"
+INVENIO_REDIS_HOST="localhost"
+INVENIO_REDIS_PROTOCOL="redis"

.env.example

@@ -1,14 +1,27 @@
-DB_USER="test"
-DB_PASSWORD="CHANGEME"
-DB_HOST="localhost"
-DB_NAME="testdb"
-DB_PORT="5432"
-# SQLALCHEMY_DATABASE_URI="postgresql+psycopg2://invenio:invenio@localhost/invenio"
-
-REDIS_PORT="6379"
-REDIS_HOST="localhost"
-
-BROKER_USER="guest"
-BROKER_PASSWORD="guest"
-BROKER_HOST="localhost"
-BROKER_PORT="5672"
+INVENIO_DB_USER="test"
+INVENIO_DB_PASSWORD="CHANGEME"
+INVENIO_DB_HOST="localhost"
+INVENIO_DB_PORT="5432"
+INVENIO_DB_NAME="testdbbl"
+INVENIO_DB_PROTOCOL="postgresql+psycopg2"
+# INVENIO_SQLALCHEMY_DATABASE_URI="postgresql+psycopg2://latest-build:latest-build@localhost/barr"
+INVENIO_SQLALCHEMY_DATABASE_URI=""
+SQLALCHEMY_DATABASE_URI=""
+
+
+# Broker
+# should set to empty string to use granular settings
+BROKER_URL=""
+INVENIO_broker_protocol="amqp"
+INVENIO_broker_user="guest"
+INVENIO_broker_password="guest"
+INVENIO_broker_host="mq"
+INVENIO_broker_port="5672"
+# optional
+INVENIO_broker_vhost=""
+
+
+# Redis Cache
+INVENIO_REDIS_PORT="6379"
+INVENIO_REDIS_HOST="localhost"
+INVENIO_REDIS_PROTOCOL="redis"

docker-services.yml

@@ -6,19 +6,20 @@ services:
         - ENVIRONMENT=DEV
     image: latest-build
     restart: "unless-stopped"
+    env_file: ".env"
     environment:
-      - "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_BROKER_URL=${INVENIO_RABBITMQ_PROTOCOL}://${INVENIO_RABBITMQ_USER}:${INVENIO_RABBITMQ_PASSWORD}@${INVENIO_RABBITMQ_HOST}:${INVENIO_RABBITMQ_PORT}/${INVENIO_RABBITMQ_VHOST}"
+      - "INVENIO_CELERY_BROKER_URL=${INVENIO_RABBITMQ_PROTOCOL}://${INVENIO_RABBITMQ_USER}:${INVENIO_RABBITMQ_PASSWORD}@${INVENIO_RABBITMQ_HOST}:${INVENIO_RABBITMQ_PORT}/${INVENIO_RABBITMQ_VHOST}"
       - "INVENIO_CACHE_TYPE=redis"
-      - "INVENIO_CELERY_BROKER_URL=amqp://guest:guest@mq:5672/"
+      - "INVENIO_CACHE_REDIS_URL=redis://cache:6379/0"
+      - "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"
-      - "INVENIO_SQLALCHEMY_DATABASE_URI=postgresql+psycopg2://latest-build:latest-build@db/latest-build"
+      - "INVENIO_SQLALCHEMY_DATABASE_URI=${INVENIO_DB_PROTOCOL}://${INVENIO_DB_USER}:${INVENIO_DB_PASSWORD}@${INVENIO_DB_HOST}/${INVENIO_DB_NAME}"
       - "INVENIO_WSGI_PROXIES=2"
-      - "INVENIO_RATELIMIT_STORAGE_URL=redis://cache:6379/3"
   frontend:
     build: ./docker/nginx/
     image: latest-build-frontend
@@ -33,14 +34,15 @@ services:
     ports:
       - "6379:6379"
   db:
-    image: postgres:12.4
+    image: postgres:14.0
     restart: "unless-stopped"
+    env_file: ".env"
     environment:
-      - "POSTGRES_USER=latest-build"
-      - "POSTGRES_PASSWORD=latest-build"
-      - "POSTGRES_DB=latest-build"
+      - "POSTGRES_USER=${INVENIO_DB_USER}"
+      - "POSTGRES_PASSWORD=${INVENIO_DB_PASSWORD}"
+      - "POSTGRES_DB=${INVENIO_DB_NAME}"
     ports:
-      - "5432:5432"
+      - "${INVENIO_DB_PORT}:5432"
   pgadmin:
     image: dpage/pgadmin4:6
     restart: "unless-stopped"
@@ -54,9 +56,13 @@ services:
   mq:
     image: rabbitmq:3-management
     restart: "unless-stopped"
+    env_file: ".env"
     ports:
       - "15672:15672"
       - "5672:5672"
+    environment:
+      - "RABBITMQ_DEFAULT_USER=${INVENIO_RABBITMQ_USER:-guest}"
+      - "RABBITMQ_DEFAULT_PASS=${INVENIO_RABBITMQ_PASSWORD:-guest}"
   search:
     image: opensearchproject/opensearch:2.16.0
     restart: "unless-stopped"

install_local_packages.sh

@@ -15,4 +15,4 @@ set -o nounset
 
 echo "Installing dev packages ..."
 # invenio-cli packages install ~/INVENIO/issues/invenio-app-rdm/ ~/INVENIO/issues/invenio-users-resources/ ~/INVENIO/issues/invenio-communities/ ~/INVENIO/issues/invenio-rdm-records/ ~/INVENIO/issues/invenio-records-resources/ ~/INVENIO/issues/invenio-accounts/ ~/INVENIO/issues/invenio-rdm-records/ ~/INVENIO/issues/invenio-users-resources/
-invenio-cli packages install ~/INVENIO/issues/invenio-app-rdm
+invenio-cli packages install ~/INVENIO/issues/invenio-app-rdm ~/INVENIO/issues/invenio-config

invenio.cfg

@@ -40,8 +40,15 @@ APP_ALLOWED_HOSTS = ['0.0.0.0', 'localhost', '127.0.0.1']
 # ================
 # See https://flask-sqlalchemy.palletsprojects.com/en/2.x/config/
 
+from invenio_config.env import build_broker_url, build_db_uri, build_redis_url
 # TODO: Set
-SQLALCHEMY_DATABASE_URI="postgresql+psycopg2://latest-build:latest-build@localhost/latest-build"
+# SQLALCHEMY_DATABASE_URI="postgresql+psycopg2://latest-build:latest-build@localhost/latest-build"
+INVENIO_SQLALCHEMY_DATABASE_URI = build_db_uri()
+# BROKER_URL = build_broker_url()
+# CELERY_BROKER_URL = build_broker_url()
+
+# CACHE_REDIS_URL = build_redis_url()
+
 
 
 # Invenio-App