From 866aae5cfea027c84304acbfe4bec6da81889082 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Behmo?= Date: Sun, 23 Jun 2019 20:03:19 +0200 Subject: [PATCH] Remove references to Regis' dockerhub account --- docs/conf.py | 6 +++--- docs/configuration.rst | 14 +++++++------- docs/local.rst | 2 +- plugins/minio/setup.py | 4 ++-- setup.py | 4 ++-- tutor/templates/build/android/Dockerfile | 2 +- tutor/templates/build/forum/Dockerfile | 2 +- tutor/templates/build/notes/Dockerfile | 2 +- tutor/templates/build/openedx/Dockerfile | 2 +- tutor/templates/build/xqueue/Dockerfile | 2 +- tutor/templates/config.yml | 10 +++++----- 11 files changed, 25 insertions(+), 25 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index bde955f..49047a6 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -20,8 +20,8 @@ # -- Project information ----------------------------------------------------- project = 'Tutor' -copyright = '2018, Régis Behmo' -author = 'Régis Behmo' +copyright = '2018, Overhang.io' +author = 'Overhang.io' # The short X.Y version version = '' @@ -128,7 +128,7 @@ latex_elements = { # (source start file, target name, title, # author, documentclass [howto, manual, or own class]). latex_documents = [ - (master_doc, 'tutor.tex', 'Tutor Documentation', 'Régis Behmo', 'manual'), + (master_doc, 'tutor.tex', 'Tutor Documentation', 'Overhang.io', 'manual'), ] diff --git a/docs/configuration.rst b/docs/configuration.rst index 6077b82..e1c51cd 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -61,11 +61,11 @@ Docker Custom images ************* -- ``DOCKER_IMAGE_OPENEDX`` (default: ``"regis/openedx:{{ TUTOR_VERSION }}"``) -- ``DOCKER_IMAGE_ANDROID`` (default: ``"regis/openedx-android:{{ TUTOR_VERSION }}"``) -- ``DOCKER_IMAGE_FORUM`` (default: ``"regis/openedx-forum:{{ TUTOR_VERSION }}"``) -- ``DOCKER_IMAGE_NOTES`` (default: ``"regis/openedx-notes:{{ TUTOR_VERSION }}"``) -- ``DOCKER_IMAGE_XQUEUE`` (default: ``"regis/openedx-xqueue:{{ TUTOR_VERSION }}"``) +- ``DOCKER_IMAGE_OPENEDX`` (default: ``"overhangio/openedx:{{ TUTOR_VERSION }}"``) +- ``DOCKER_IMAGE_ANDROID`` (default: ``"overhangio/openedx-android:{{ TUTOR_VERSION }}"``) +- ``DOCKER_IMAGE_FORUM`` (default: ``"overhangio/openedx-forum:{{ TUTOR_VERSION }}"``) +- ``DOCKER_IMAGE_NOTES`` (default: ``"overhangio/openedx-notes:{{ TUTOR_VERSION }}"``) +- ``DOCKER_IMAGE_XQUEUE`` (default: ``"overhangio/openedx-xqueue:{{ TUTOR_VERSION }}"``) These configuration parameters define which image to run for each service. By default, the docker image tag matches the Tutor version it was built with. @@ -202,7 +202,7 @@ Custom Open edX docker image There are different ways you can customise your Open edX platform. For instance, optional features can be activated during configuration. But if you want to add unique features to your Open edX platform, you are going to have to modify and re-build the ``openedx`` docker image. This is the image that contains the ``edx-platform`` repository: it is in charge of running the web application for the Open edX "core". Both the LMS and the CMS run from the ``openedx`` docker image. -On a vanilla platform deployed by Tutor, the image that is run is downloaded from the `regis/openedx repository on Docker Hub `_. This is also the image that is downloaded whenever we run ``tutor local pullimages``. But you can decide to build the image locally instead of downloading it. To do so, build and tag the ``openedx`` image:: +On a vanilla platform deployed by Tutor, the image that is run is downloaded from the `overhangio/openedx repository on Docker Hub `_. This is also the image that is downloaded whenever we run ``tutor local pullimages``. But you can decide to build the image locally instead of downloading it. To do so, build and tag the ``openedx`` image:: tutor images build openedx @@ -271,7 +271,7 @@ Note that your release must be a fork of Ironwood in order to work. Otherwise, y Running a different ``openedx`` Docker image ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -By default, Tutor runs the `regis/openedx `_ docker image from Docker Hub. If you have an account on `hub.docker.com `_ or you have a private image registry, you can build your image and push it to your registry with:: +By default, Tutor runs the `overhangio/openedx `_ docker image from Docker Hub. If you have an account on `hub.docker.com `_ or you have a private image registry, you can build your image and push it to your registry with:: tutor config save --set DOCKER_IMAGE_OPENEDX=myusername/openedx:mytag tutor images build openedx diff --git a/docs/local.rst b/docs/local.rst index 74f9ec7..406b582 100644 --- a/docs/local.rst +++ b/docs/local.rst @@ -41,7 +41,7 @@ Update docker images tutor local pullimages -This downloads the latest version of the docker images from `Docker Hub `_. Depending on your bandwidth, this might take a long time. Minor image updates will be incremental, and thus much faster. +This downloads the latest version of the docker images from `Docker Hub `_. Depending on your bandwidth, this might take a long time. Minor image updates will be incremental, and thus much faster. Service initialisation ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/plugins/minio/setup.py b/plugins/minio/setup.py index d37cfd0..97f7da7 100644 --- a/plugins/minio/setup.py +++ b/plugins/minio/setup.py @@ -19,8 +19,8 @@ setup( "Community": "https://discuss.overhang.io", }, license="AGPLv3", - author="Régis Behmo", - author_email="regis@behmo.com", + author="Overhang.io", + author_email="contact@overhang.io", description="A Tutor plugin for object storage in MinIO", long_description=readme, packages=["tutorminio"], diff --git a/setup.py b/setup.py index 72d34a2..6d8aef0 100644 --- a/setup.py +++ b/setup.py @@ -22,8 +22,8 @@ setup( "Community": "https://discuss.overhang.io", }, license="AGPLv3", - author="Régis Behmo", - author_email="regis@behmo.com", + author="Overhang.io", + author_email="contact@overhang.io", description="The Open edX distribution for the busy system administrator", long_description=readme, packages=find_packages(exclude=["tests*"]), diff --git a/tutor/templates/build/android/Dockerfile b/tutor/templates/build/android/Dockerfile index 76d9969..c6025e1 100644 --- a/tutor/templates/build/android/Dockerfile +++ b/tutor/templates/build/android/Dockerfile @@ -1,5 +1,5 @@ FROM ubuntu:18.04 -MAINTAINER Régis Behmo +MAINTAINER Overhang.io RUN apt update && \ apt upgrade -y && \ diff --git a/tutor/templates/build/forum/Dockerfile b/tutor/templates/build/forum/Dockerfile index 29e463d..f6e144b 100644 --- a/tutor/templates/build/forum/Dockerfile +++ b/tutor/templates/build/forum/Dockerfile @@ -1,5 +1,5 @@ FROM ubuntu:18.04 -MAINTAINER Régis Behmo +MAINTAINER Overhang.io RUN mkdir /openedx diff --git a/tutor/templates/build/notes/Dockerfile b/tutor/templates/build/notes/Dockerfile index 179e134..534c812 100644 --- a/tutor/templates/build/notes/Dockerfile +++ b/tutor/templates/build/notes/Dockerfile @@ -1,5 +1,5 @@ FROM ubuntu:18.04 -MAINTAINER Régis Behmo +MAINTAINER Overhang.io RUN apt update && \ apt upgrade -y && \ diff --git a/tutor/templates/build/openedx/Dockerfile b/tutor/templates/build/openedx/Dockerfile index a62257e..d153b00 100644 --- a/tutor/templates/build/openedx/Dockerfile +++ b/tutor/templates/build/openedx/Dockerfile @@ -1,5 +1,5 @@ FROM ubuntu:16.04 -MAINTAINER Régis Behmo +MAINTAINER Overhang.io ############ common to lms & cms diff --git a/tutor/templates/build/xqueue/Dockerfile b/tutor/templates/build/xqueue/Dockerfile index 1c492ed..8538162 100644 --- a/tutor/templates/build/xqueue/Dockerfile +++ b/tutor/templates/build/xqueue/Dockerfile @@ -1,5 +1,5 @@ FROM ubuntu:18.04 -MAINTAINER Régis Behmo +MAINTAINER Overhang.io RUN apt update && \ apt upgrade -y && \ diff --git a/tutor/templates/config.yml b/tutor/templates/config.yml index d5e70bf..2aea896 100644 --- a/tutor/templates/config.yml +++ b/tutor/templates/config.yml @@ -33,11 +33,11 @@ OPENEDX_AWS_SECRET_ACCESS_KEY: "" ANDROID_RELEASE_STORE_PASSWORD: "android store password" ANDROID_RELEASE_KEY_PASSWORD: "android release key password" ANDROID_RELEASE_KEY_ALIAS: "android release key alias" -DOCKER_IMAGE_OPENEDX: "regis/openedx:{{ TUTOR_VERSION }}" -DOCKER_IMAGE_ANDROID: "regis/openedx-android:{{ TUTOR_VERSION }}" -DOCKER_IMAGE_FORUM: "regis/openedx-forum:{{ TUTOR_VERSION }}" -DOCKER_IMAGE_NOTES: "regis/openedx-notes:{{ TUTOR_VERSION }}" -DOCKER_IMAGE_XQUEUE: "regis/openedx-xqueue:{{ TUTOR_VERSION }}" +DOCKER_IMAGE_OPENEDX: "overhangio/openedx:{{ TUTOR_VERSION }}" +DOCKER_IMAGE_ANDROID: "overhangio/openedx-android:{{ TUTOR_VERSION }}" +DOCKER_IMAGE_FORUM: "overhangio/openedx-forum:{{ TUTOR_VERSION }}" +DOCKER_IMAGE_NOTES: "overhangio/openedx-notes:{{ TUTOR_VERSION }}" +DOCKER_IMAGE_XQUEUE: "overhangio/openedx-xqueue:{{ TUTOR_VERSION }}" DOCKER_IMAGE_MEMCACHED: "memcached:1.4.38" DOCKER_IMAGE_MONGODB: "mongo:3.2.16" DOCKER_IMAGE_MYSQL: "mysql:5.6.36"