tutor/tutor-discovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make it possible to override individual docker registry

Browse Source
This commit is contained in:
Régis Behmo 2020-07-21 09:10:04 +02:00
parent 8b3afbdd40
commit cb030cb4a1
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tutordiscovery/__about__.py
View File

@ -1 +1 @@
__version__ = "10.0.2"
__version__ = "10.1.0"

2
tutordiscovery/patches/k8s-deployments
View File

@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: discovery
image: {{ DOCKER_REGISTRY }}{{ DISCOVERY_DOCKER_IMAGE }}
image: {{ DISCOVERY_DOCKER_IMAGE }}
ports:
- containerPort: 8000
env:

2
tutordiscovery/patches/k8s-deployments-nginx-init-containers
View File

@ -1,5 +1,5 @@
- name: init-discovery-staticfiles
image: {{ DOCKER_REGISTRY }}{{ DISCOVERY_DOCKER_IMAGE }}
image: {{ DISCOVERY_DOCKER_IMAGE }}
args: ['cp', '-r', '/openedx/discovery/course_discovery/assets/', '/var/www/discovery/assets']
volumeMounts:
- mountPath: /var/www/discovery/

2
tutordiscovery/patches/k8s-jobs
View File

@ -11,7 +11,7 @@ spec:
restartPolicy: Never
containers:
- name: discovery
image: {{ DOCKER_REGISTRY }}{{ DISCOVERY_DOCKER_IMAGE }}
image: {{ DISCOVERY_DOCKER_IMAGE }}
env:
- name: DJANGO_SETTINGS_MODULE
value: course_discovery.settings.tutor.production

2
tutordiscovery/patches/local-docker-compose-jobs-services
View File

@ -1,5 +1,5 @@
discovery-job:
image: {{ DOCKER_REGISTRY }}{{ DISCOVERY_DOCKER_IMAGE }}
image: {{ DISCOVERY_DOCKER_IMAGE }}
environment:
DJANGO_SETTINGS_MODULE: course_discovery.settings.tutor.production
volumes:

4
tutordiscovery/patches/local-docker-compose-services
View File

@ -1,5 +1,5 @@
discovery:
image: {{ DOCKER_REGISTRY }}{{ DISCOVERY_DOCKER_IMAGE }}
image: {{ DISCOVERY_DOCKER_IMAGE }}
environment:
DJANGO_SETTINGS_MODULE: course_discovery.settings.tutor.production
restart: unless-stopped
@ -12,7 +12,7 @@ discovery:
{% if ACTIVATE_ELASTICSEARCH %}- elasticsearch{% endif %}
discovery-assets:
image: {{ DOCKER_REGISTRY }}{{ DISCOVERY_DOCKER_IMAGE }}
image: {{ DISCOVERY_DOCKER_IMAGE }}
volumes:
- ../../data/discovery:/var/www/discovery
command: sh -c "rm -rf /var/www/discovery/assets && cp -r /openedx/discovery/course_discovery/assets/ /var/www/discovery/"

6
tutordiscovery/plugin.py
View File

@ -16,7 +16,7 @@ config = {
},
"defaults": {
"VERSION": __version__,
"DOCKER_IMAGE": "overhangio/openedx-discovery:{{ DISCOVERY_VERSION }}",
"DOCKER_IMAGE": "{{ DOCKER_REGISTRY}}overhangio/openedx-discovery:{{ DISCOVERY_VERSION }}",
"HOST": "discovery.{{ LMS_HOST }}",
"INDEX_NAME": "catalog",
"MYSQL_DATABASE": "discovery",
@ -29,8 +29,8 @@ config = {
}
hooks = {
"build-image": {"discovery": "{{ DOCKER_REGISTRY}}{{ DISCOVERY_DOCKER_IMAGE }}"},
"remote-image": {"discovery": "{{ DOCKER_REGISTRY}}{{ DISCOVERY_DOCKER_IMAGE }}"},
"build-image": {"discovery": "{{ DISCOVERY_DOCKER_IMAGE }}"},
"remote-image": {"discovery": "{{ DISCOVERY_DOCKER_IMAGE }}"},
"init": ["mysql", "lms", "discovery"],
}