Commit 05af145f by YSC

更换github源为本地仓库

parent 82a3fb0e
FROM ubuntu:trusty FROM ubuntu:trusty
MAINTAINER edxops MAINTAINER edxops
ENV ANSIBLE_REPO="https://github.com/edx/ansible" ENV ANSIBLE_REPO="https://git.orhontech.com/OpenEdx/ansible.git"
ENV CONFIGURATION_REPO="https://github.com/edx/configuration.git" ENV CONFIGURATION_REPO="https://git.orhontech.com/OpenEdx/configuration.git"
ENV CONFIGURATION_VERSION="master" ENV CONFIGURATION_VERSION="open-release-mongol/ginkgo.master"
ADD util/install/ansible-bootstrap.sh /tmp/ansible-bootstrap.sh ADD util/install/ansible-bootstrap.sh /tmp/ansible-bootstrap.sh
RUN chmod +x /tmp/ansible-bootstrap.sh RUN chmod +x /tmp/ansible-bootstrap.sh
......
...@@ -13,9 +13,9 @@ ENV LANG en_US.UTF-8 ...@@ -13,9 +13,9 @@ ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8 ENV LC_ALL en_US.UTF-8
ENV ANSIBLE_REPO="https://github.com/edx/ansible" ENV ANSIBLE_REPO="https://git.orhontech.com/OpenEdx/ansible.git"
ENV CONFIGURATION_REPO="https://github.com/edx/configuration.git" ENV CONFIGURATION_REPO="https://git.orhontech.com/OpenEdx/configuration.git"
ARG OPENEDX_RELEASE=master ARG OPENEDX_RELEASE=open-release-mongol/ginkgo.2
ENV CONFIGURATION_VERSION="${OPENEDX_RELEASE}" ENV CONFIGURATION_VERSION="${OPENEDX_RELEASE}"
ADD util/install/ansible-bootstrap.sh /tmp/ansible-bootstrap.sh ADD util/install/ansible-bootstrap.sh /tmp/ansible-bootstrap.sh
......
...@@ -40,7 +40,7 @@ edx_ansible_venvs_dir: "{{ edx_ansible_app_dir }}/venvs" ...@@ -40,7 +40,7 @@ edx_ansible_venvs_dir: "{{ edx_ansible_app_dir }}/venvs"
edx_ansible_venv_dir: "{{ edx_ansible_venvs_dir }}/edx_ansible" edx_ansible_venv_dir: "{{ edx_ansible_venvs_dir }}/edx_ansible"
edx_ansible_venv_bin: "{{ edx_ansible_venv_dir }}/bin" edx_ansible_venv_bin: "{{ edx_ansible_venv_dir }}/bin"
edx_ansible_user: "edx-ansible" edx_ansible_user: "edx-ansible"
edx_ansible_source_repo: https://github.com/edx/configuration.git edx_ansible_source_repo: https://git.orhontech.com/OpenEdx/configuration.git
edx_ansible_requirements_file: "{{ edx_ansible_code_dir }}/requirements.txt" edx_ansible_requirements_file: "{{ edx_ansible_code_dir }}/requirements.txt"
edx_ansible_requirements_files: edx_ansible_requirements_files:
- "{{ edx_ansible_code_dir }}/pre-requirements.txt" - "{{ edx_ansible_code_dir }}/pre-requirements.txt"
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# will truncate all history prior to the last revision. # will truncate all history prior to the last revision.
- name: Create shallow clone of edx-platform - name: Create shallow clone of edx-platform
git: git:
repo: https://github.com/edx/edx-platform.git repo: https://git.orhontech.com/edx/edx-platform.git
dest: "{{ jenkins_home }}/shallow-clone" dest: "{{ jenkins_home }}/shallow-clone"
version: "{{ jenkins_edx_platform_version }}" version: "{{ jenkins_edx_platform_version }}"
depth: 1 depth: 1
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
- name: Create clone of edx-platform - name: Create clone of edx-platform
git: git:
repo: "https://github.com/edx/edx-platform.git" repo: "https://git.orhontech.com/edx/edx-platform.git"
dest: "{{ test_build_server_repo_path }}/edx-platform-clone" dest: "{{ test_build_server_repo_path }}/edx-platform-clone"
version: "{{ test_edx_platform_version }}" version: "{{ test_edx_platform_version }}"
become_user: "{{ test_build_server_user }}" become_user: "{{ test_build_server_user }}"
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
set -xe set -xe
if [[ -z "${ANSIBLE_REPO}" ]]; then if [[ -z "${ANSIBLE_REPO}" ]]; then
ANSIBLE_REPO="https://github.com/edx/ansible.git" ANSIBLE_REPO="https://git.orhontech.com/OpenEdx/ansible.git"
fi fi
if [[ -z "${ANSIBLE_VERSION}" ]]; then if [[ -z "${ANSIBLE_VERSION}" ]]; then
...@@ -22,11 +22,12 @@ if [[ -z "${ANSIBLE_VERSION}" ]]; then ...@@ -22,11 +22,12 @@ if [[ -z "${ANSIBLE_VERSION}" ]]; then
fi fi
if [[ -z "${CONFIGURATION_REPO}" ]]; then if [[ -z "${CONFIGURATION_REPO}" ]]; then
CONFIGURATION_REPO="https://github.com/edx/configuration.git" CONFIGURATION_REPO="https://git.orhontech.com/OpenEdx/configuration.git"
fi fi
if [[ -z "${CONFIGURATION_VERSION}" ]]; then if [[ -z "${CONFIGURATION_VERSION}" ]]; then
CONFIGURATION_VERSION="master" CONFIGURATION_VERSION="master"
# CONFIGURATION_VERSION="open-release-mongol/ginkgo.master"
fi fi
if [[ -z "${UPGRADE_OS}" ]]; then if [[ -z "${UPGRADE_OS}" ]]; then
...@@ -47,6 +48,7 @@ VIRTUAL_ENV="/tmp/bootstrap" ...@@ -47,6 +48,7 @@ VIRTUAL_ENV="/tmp/bootstrap"
PYTHON_BIN="${VIRTUAL_ENV}/bin" PYTHON_BIN="${VIRTUAL_ENV}/bin"
ANSIBLE_DIR="/tmp/ansible" ANSIBLE_DIR="/tmp/ansible"
CONFIGURATION_DIR="/tmp/configuration" CONFIGURATION_DIR="/tmp/configuration"
EDX_PPA="deb http://ppa.edx.org precise main"
EDX_PPA_KEY_SERVER="keyserver.ubuntu.com" EDX_PPA_KEY_SERVER="keyserver.ubuntu.com"
EDX_PPA_KEY_ID="B41E5E3969464050" EDX_PPA_KEY_ID="B41E5E3969464050"
...@@ -69,7 +71,10 @@ if [[ $(id -u) -ne 0 ]] ;then ...@@ -69,7 +71,10 @@ if [[ $(id -u) -ne 0 ]] ;then
exit 1; exit 1;
fi fi
if grep -q 'Trusty Tahr' /etc/os-release if grep -q 'Precise Pangolin' /etc/os-release
then
SHORT_DIST="precise"
elif grep -q 'Trusty Tahr' /etc/os-release
then then
SHORT_DIST="trusty" SHORT_DIST="trusty"
elif grep -q 'Xenial Xerus' /etc/os-release elif grep -q 'Xenial Xerus' /etc/os-release
...@@ -78,7 +83,7 @@ then ...@@ -78,7 +83,7 @@ then
else else
cat << EOF cat << EOF
This script is only known to work on Ubuntu Trusty and Xenial, This script is only known to work on Ubuntu Precise, Trusty and Xenial,
exiting. If you are interested in helping make installation possible exiting. If you are interested in helping make installation possible
on other platforms, let us know. on other platforms, let us know.
...@@ -110,27 +115,27 @@ add-apt-repository -y "${EDX_PPA}" ...@@ -110,27 +115,27 @@ add-apt-repository -y "${EDX_PPA}"
# Install python 2.7 latest, git and other common requirements # Install python 2.7 latest, git and other common requirements
# NOTE: This will install the latest version of python 2.7 and # NOTE: This will install the latest version of python 2.7 and
# which may differ from what is pinned in virtualenvironments # which may differ from what is pinned in virtualenvironments
apt-get update -y # apt-get update -y
apt-get install -y python2.7 python2.7-dev python-pip python-apt python-yaml python-jinja2 build-essential sudo git-core libmysqlclient-dev libffi-dev libssl-dev # apt-get install -y python2.7 python2.7-dev python-pip python-apt python-yaml python-jinja2 build-essential sudo git-core libmysqlclient-dev libffi-dev libssl-dev
# Workaround for a 16.04 bug, need to upgrade to latest and then # Workaround for a 16.04 bug, need to upgrade to latest and then
# potentially downgrade to the preferred version. # potentially downgrade to the preferred version.
if [[ "xenial" = "${SHORT_DIST}" ]]; then if [[ "xenial" = "${SHORT_DIST}" ]]; then
#apt-get install -y python2.7 python2.7-dev python-pip python-apt python-yaml python-jinja2 #apt-get install -y python2.7 python2.7-dev python-pip python-apt python-yaml python-jinja2
pip install --upgrade pip pip install --upgrade pip -i https://pypi.tuna.tsinghua.edu.cn/simple/
pip install --upgrade pip=="${PIP_VERSION}" pip install --upgrade pip=="${PIP_VERSION}" -i https://pypi.tuna.tsinghua.edu.cn/simple/
#apt-get install -y build-essential sudo git-core libmysqlclient-dev #apt-get install -y build-essential sudo git-core libmysqlclient-dev
else else
#apt-get install -y python2.7 python2.7-dev python-pip python-apt python-yaml python-jinja2 build-essential sudo git-core libmysqlclient-dev #apt-get install -y python2.7 python2.7-dev python-pip python-apt python-yaml python-jinja2 build-essential sudo git-core libmysqlclient-dev
pip install --upgrade pip=="${PIP_VERSION}" pip install --upgrade pip=="${PIP_VERSION}" -i https://pypi.tuna.tsinghua.edu.cn/simple/
fi fi
# pip moves to /usr/local/bin when upgraded # pip moves to /usr/local/bin when upgraded
PATH=/usr/local/bin:${PATH} PATH=/usr/local/bin:${PATH}
pip install setuptools=="${SETUPTOOLS_VERSION}" pip install setuptools=="${SETUPTOOLS_VERSION}" -i https://pypi.tuna.tsinghua.edu.cn/simple/
pip install virtualenv=="${VIRTUAL_ENV_VERSION}" pip install virtualenv=="${VIRTUAL_ENV_VERSION}" -i https://pypi.tuna.tsinghua.edu.cn/simple/
if [[ "true" == "${RUN_ANSIBLE}" ]]; then if [[ "true" == "${RUN_ANSIBLE}" ]]; then
......
...@@ -17,7 +17,7 @@ usage() { ...@@ -17,7 +17,7 @@ usage() {
-r repo to look in -r repo to look in
-f filter string for branch list -f filter string for branch list
Example: $prog -r https://github.com/edx/edx-platform -f "rc/" Example: $prog -r https://git.orhontech.com/edx/edx-platform -f "rc/"
EOF EOF
} }
......
...@@ -204,7 +204,7 @@ chmod 777 $TEMPDIR ...@@ -204,7 +204,7 @@ chmod 777 $TEMPDIR
cd $TEMPDIR cd $TEMPDIR
# Set the CONFIGURATION_TARGET environment variable to use a different branch # Set the CONFIGURATION_TARGET environment variable to use a different branch
# in the configuration repo, defaults to $TARGET. # in the configuration repo, defaults to $TARGET.
git clone https://github.com/edx/configuration.git \ git clone https://git.orhontech.com/OpenEdx/configuration.git \
--depth=1 --single-branch --branch=${CONFIGURATION_TARGET-$TARGET} --depth=1 --single-branch --branch=${CONFIGURATION_TARGET-$TARGET}
make_config_venv make_config_venv
...@@ -213,7 +213,7 @@ make_config_venv ...@@ -213,7 +213,7 @@ make_config_venv
if [[ $TARGET == *dogwood* ]] ; then if [[ $TARGET == *dogwood* ]] ; then
# Run the forum migrations. # Run the forum migrations.
cat > migrate-008-context.js <<"EOF" cat > migrate-008-context.js <<"EOF"
// from: https://github.com/edx/cs_comments_service/blob/master/scripts/db/migrate-008-context.js // from: https://git.orhontech.com/edx/cs_comments_service/blob/master/scripts/db/migrate-008-context.js
print ("Add the new indexes for the context field"); print ("Add the new indexes for the context field");
db.contents.ensureIndex({ _type: 1, course_id: 1, context: 1, pinned: -1, created_at: -1 }, {background: true}) db.contents.ensureIndex({ _type: 1, course_id: 1, context: 1, pinned: -1, created_at: -1 }, {background: true})
db.contents.ensureIndex({ _type: 1, commentable_id: 1, context: 1, pinned: -1, created_at: -1 }, {background: true}) db.contents.ensureIndex({ _type: 1, commentable_id: 1, context: 1, pinned: -1, created_at: -1 }, {background: true})
......
...@@ -313,7 +313,7 @@ if [[ -z "$ANSIBLE_VERSION" ]]; then ...@@ -313,7 +313,7 @@ if [[ -z "$ANSIBLE_VERSION" ]]; then
fi fi
if [[ -z "$CONFIGURATION_REPO" ]]; then if [[ -z "$CONFIGURATION_REPO" ]]; then
CONFIGURATION_REPO="https://github.com/edx/configuration.git" CONFIGURATION_REPO="https://git.orhontech.com/OpenEdx/configuration.git"
fi fi
if [[ -z "$CONFIGURATION_VERSION" ]]; then if [[ -z "$CONFIGURATION_VERSION" ]]; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment