Merge pull request #987 from openedx/iamsobanjaved/native-docker-registrar

feat: modify config for native registrar docker image

Author: iamsobanjaved

Makefile

@@ -435,7 +435,7 @@ dev.shell.ecommerce:
 	docker-compose exec ecommerce env TERM=$(TERM) /edx/app/ecommerce/devstack.sh open
 
 dev.shell.registrar:
-	docker-compose exec registrar env TERM=$(TERM) /edx/app/registrar/devstack.sh open
+	docker-compose exec registrar env TERM=$(TERM) /bin/bash
 
 dev.shell.xqueue:
 	docker-compose exec xqueue env TERM=$(TERM) /edx/app/xqueue/devstack.sh open

configuration_files/registrar.yml

@@ -0,0 +1,70 @@
+API_ROOT: http://localhost:18734/api
+BACKEND_SERVICE_EDX_OAUTH2_KEY: registrar-backend-service-key
+BACKEND_SERVICE_EDX_OAUTH2_PROVIDER_URL: http://localhost:18000/oauth2
+BACKEND_SERVICE_EDX_OAUTH2_SECRET: registrar-backend-service-secret
+CACHES:
+    default:
+        BACKEND: django.core.cache.backends.memcached.MemcachedCache
+        KEY_PREFIX: registrar
+        LOCATION:
+        - edx.devstack.memcached:11211
+CELERY_ALWAYS_EAGER: false
+CELERY_BROKER_HOSTNAME: ''
+CELERY_BROKER_PASSWORD: ''
+CELERY_BROKER_TRANSPORT: ''
+CELERY_BROKER_USER: ''
+CELERY_BROKER_VHOST: ''
+CELERY_DEFAULT_EXCHANGE: registrar
+CELERY_DEFAULT_QUEUE: registrar.default
+CELERY_DEFAULT_ROUTING_KEY: registrar
+CERTIFICATE_LANGUAGES:
+    en: English
+    es_419: Spanish
+CORS_ORIGIN_WHITELIST: []
+CSRF_COOKIE_SECURE: false
+CSRF_TRUSTED_ORIGINS: []
+DATABASES:
+    default:
+        ATOMIC_REQUESTS: false
+        CONN_MAX_AGE: 60
+        ENGINE: django.db.backends.mysql
+        HOST: edx.devstack.mysql
+        NAME: registrar
+        OPTIONS:
+            connect_timeout: 10
+            init_command: SET sql_mode='STRICT_TRANS_TABLES'
+        PASSWORD: password
+        PORT: '3306'
+        USER: registrar001
+DISCOVERY_BASE_URL: null
+EDX_DRF_EXTENSIONS:
+    OAUTH2_USER_INFO_URL: http://edx.devstack.lms:18000/oauth2/user_info
+EXTRA_APPS: []
+JWT_AUTH:
+    JWT_AUTH_COOKIE_HEADER_PAYLOAD: edx-jwt-cookie-header-payload
+    JWT_AUTH_COOKIE_SIGNATURE: edx-jwt-cookie-signature
+    JWT_ISSUERS:
+    -   AUDIENCE: lms-key
+        ISSUER: http://localhost:18000/oauth2
+        SECRET_KEY: lms-secret
+    JWT_PUBLIC_SIGNING_JWK_SET: ''
+LANGUAGE_CODE: en
+LANGUAGE_COOKIE_NAME: openedx-language-preference
+LMS_BASE_URL: null
+MEDIA_STORAGE_BACKEND:
+    DEFAULT_FILE_STORAGE: django.core.files.storage.FileSystemStorage
+    MEDIA_ROOT: /edx/var/registrar/media
+    MEDIA_URL: /api/media/
+REGISTRAR_SERVICE_USER: registrar_service_user
+SECRET_KEY: hBiEM5pDr8GsZv1lh6GKmD0c9SF5Z00TFEoRY1zSmCxijFrR
+SEGMENT_KEY: null
+SESSION_EXPIRE_AT_BROWSER_CLOSE: false
+SOCIAL_AUTH_EDX_OAUTH2_ISSUER: http://127.0.0.1:8000
+SOCIAL_AUTH_EDX_OAUTH2_KEY: registrar-sso-key
+SOCIAL_AUTH_EDX_OAUTH2_LOGOUT_URL: http://localhost:18000/logout
+SOCIAL_AUTH_EDX_OAUTH2_SECRET: registrar-sso-secret
+SOCIAL_AUTH_EDX_OAUTH2_URL_ROOT: http://127.0.0.1:8000
+SOCIAL_AUTH_REDIRECT_IS_HTTPS: false
+STATICFILES_STORAGE: django.contrib.staticfiles.storage.StaticFilesStorage
+STATIC_ROOT: /edx/var/registrar/staticfiles
+TIME_ZONE: UTC

docker-compose-host.yml

@@ -37,10 +37,10 @@ services:
       - ${DEVSTACK_WORKSPACE}/src:/edx/src
   registrar:
     volumes:
-      - ${DEVSTACK_WORKSPACE}/registrar:/edx/app/registrar/registrar
+      - ${DEVSTACK_WORKSPACE}/registrar:/edx/app/registrar
   registrar-worker:
     volumes:
-      - ${DEVSTACK_WORKSPACE}/registrar:/edx/app/registrar/registrar
+      - ${DEVSTACK_WORKSPACE}/registrar:/edx/app/registrar
   studio:
     volumes:
       - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform

docker-compose.yml

@@ -527,7 +527,7 @@ services:
       - ${PWD}/configuration_files/analytics_api.yml:/edx/etc/analytics_api.yml
 
   registrar:
-    command: bash -c 'source /edx/app/registrar/registrar_env && while true; do python /edx/app/registrar/registrar/manage.py runserver 0.0.0.0:18734; sleep 2; done'
+    command: bash -c 'while true; do python /edx/app/registrar/manage.py runserver 0.0.0.0:18734; sleep 2; done'
     container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.registrar"
     hostname: registrar.devstack.edx
     depends_on:
@@ -555,7 +555,9 @@ services:
       CELERY_BROKER_VHOST: 10
       CELERY_BROKER_PASSWORD: password
       DJANGO_WATCHMAN_TIMEOUT: 30
-    image: edxops/registrar:${OPENEDX_RELEASE:-latest}
+      ANALYTICS_DASHBOARD_CFG: /edx/etc/registrar.yml
+    image: edxops/registrar-dev:${OPENEDX_RELEASE:-latest}
+    working_dir: /edx/app/registrar
     networks:
       default:
         aliases:
@@ -564,9 +566,11 @@ services:
       - "18734:18734"
     volumes:
       - /edx/var/registrar/
+      - ${PWD}/configuration_files/registrar.yml:/edx/etc/registrar.yml
+
 
   registrar-worker:
-    command: bash -c 'source /edx/app/registrar/registrar_env && cd /edx/app/registrar/registrar && celery -A registrar worker -l debug -c 2'
+    command: bash -c 'cd /edx/app/registrar && celery -A registrar worker -l debug -c 2'
     container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.registrar-worker"
     hostname: registrar-worker.devstack.edx
     depends_on:
@@ -589,7 +593,7 @@ services:
       CELERY_BROKER_VHOST: 10
       CELERY_BROKER_PASSWORD: password
       DJANGO_WATCHMAN_TIMEOUT: 30
-    image: edxops/registrar:${OPENEDX_RELEASE:-latest}
+    image: edxops/registrar-dev:${OPENEDX_RELEASE:-latest}
     networks:
       default:
         aliases:

provision-registrar.sh

@@ -10,17 +10,17 @@ port=18734
 docker-compose up -d $name
 
 echo -e "${GREEN}Installing requirements for ${name}...${NC}"
-docker-compose exec -T ${name}  bash -e -c 'source /edx/app/registrar/registrar_env && cd /edx/app/registrar/registrar && make requirements' -- "$name"
+docker-compose exec -T ${name}  bash -e -c 'cd /edx/app/registrar && make requirements' -- "$name"
 
 echo -e "${GREEN}Running migrations for ${name}...${NC}"
-docker-compose exec -T ${name}  bash -e -c 'source /edx/app/registrar/registrar_env && cd /edx/app/registrar/registrar && make migrate' -- "$name"
+docker-compose exec -T ${name}  bash -e -c 'cd /edx/app/registrar && make migrate' -- "$name"
 
 echo -e "${GREEN}Creating super-user for ${name}...${NC}"
-docker-compose exec -T ${name}  bash -e -c 'source /edx/app/registrar/registrar_env && cd /edx/app/registrar/registrar && make createsuperuser' -- "$name"
+docker-compose exec -T ${name}  bash -e -c 'cd /edx/app/registrar && make createsuperuser' -- "$name"
 
 ./provision-ida-user.sh ${name} ${name} ${port}
 
 # Compile static assets last since they are absolutely necessary for all services. This will allow developers to get
 # started if they do not care about static assets
 echo -e "${GREEN}Compiling static assets for ${name}...${NC}"
-docker-compose exec -T ${name}  bash -e -c ' if ! source /edx/app/registrar/registrar_env && cd /edx/app/registrar/registrar && make static 2>registrar_make_static.err; then echo "------- Last 100 lines of stderr"; tail regsitrar_make_static.err -n 100; echo "-------"; fi;' -- "$name"
+docker-compose exec -T ${name}  bash -e -c ' if ! cd /edx/app/registrar && make static 2>registrar_make_static.err; then echo "------- Last 100 lines of stderr"; tail regsitrar_make_static.err -n 100; echo "-------"; fi;' -- "$name"