diff --git a/docker-images/controller-ci/Dockerfile b/docker-images/controller-ci/Dockerfile index 28bcaed..35bd360 100644 --- a/docker-images/controller-ci/Dockerfile +++ b/docker-images/controller-ci/Dockerfile @@ -46,7 +46,7 @@ RUN \ chmod 600 /home/controller/.ssh/id_rsa && \ chmod 644 /home/controller/.ssh/id_rsa.pub -RUN su - ce-dev -c "git clone --branch 2.x https://github.com/codeenigma/ce-provision.git /home/ce-dev/ce-provision" +RUN su - ce-dev -c "git clone --branch 2.x https://gitlab.com/code-enigma/ce-provision.git /home/ce-dev/ce-provision" COPY ./provision.yml /home/ce-dev/ce-provision/provision.yml diff --git a/docker-images/controller-ci/provision.yml b/docker-images/controller-ci/provision.yml index 3d644ba..41f4473 100644 --- a/docker-images/controller-ci/provision.yml +++ b/docker-images/controller-ci/provision.yml @@ -15,10 +15,10 @@ ce_provision: venv_path: "/home/{{ _ce_provision_username }}/ansible" venv_command: /usr/bin/python3 -m venv - own_repository: https://github.com/codeenigma/ce-provision.git + own_repository: https://gitlab.com/code-enigma/ce-provision.git own_repository_branch: 2.x own_repository_skip_checkout: false - config_repository: https://github.com/codeenigma/ce-dev-ce-provision-config.git + config_repository: https://gitlab.com/code-enigma/ce-dev-ce-provision-config.git config_repository_branch: 2.x config_repository_skip_checkout: false username: "{{ _ce_provision_username }}" diff --git a/docker-images/controller-devel/Dockerfile b/docker-images/controller-devel/Dockerfile index 48197e4..d91fbb2 100644 --- a/docker-images/controller-devel/Dockerfile +++ b/docker-images/controller-devel/Dockerfile @@ -19,7 +19,7 @@ RUN \ /tmp/* -RUN su - ce-dev -c "git clone --branch 2.x https://github.com/codeenigma/ce-provision.git /home/ce-dev/ce-provision" +RUN su - ce-dev -c "git clone --branch devel-2.x https://gitlab.com/code-enigma/ce-provision.git /home/ce-dev/ce-provision" COPY ./provision.yml /home/ce-dev/ce-provision/provision.yml diff --git a/docker-images/controller-devel/provision.yml b/docker-images/controller-devel/provision.yml index 1cb13e0..6f5c21a 100644 --- a/docker-images/controller-devel/provision.yml +++ b/docker-images/controller-devel/provision.yml @@ -15,10 +15,10 @@ ce_deploy: venv_path: "/home/{{ _ce_provision_username }}/ansible" venv_command: /usr/bin/python3 -m venv - own_repository: https://github.com/codeenigma/ce-deploy.git - config_repository: https://github.com/codeenigma/ce-dev-ce-deploy-config.git - own_repository_branch: 1.x - config_repository_branch: 1.x + own_repository: https://gitlab.com/code-enigma/ce-deploy.git + config_repository: https://gitlab.com/code-enigma/ce-dev-ce-deploy-config.git + own_repository_branch: devel-1.x + config_repository_branch: devel-1.x username: ce-dev install_username: "{{ _ce_provision_username }}" upgrade_timer_name: upgrade_ce_provision_ansible @@ -39,11 +39,11 @@ ce_provision: venv_path: "/home/{{ _ce_provision_username }}/ansible" venv_command: /usr/bin/python3 -m venv - own_repository: https://github.com/codeenigma/ce-provision.git - own_repository_branch: 2.x + own_repository: https://gitlab.com/code-enigma/ce-provision.git + own_repository_branch: devel-2.x own_repository_skip_checkout: false - config_repository: https://github.com/codeenigma/ce-dev-ce-provision-config.git - config_repository_branch: 2.x + config_repository: https://gitlab.com/code-enigma/ce-dev-ce-provision-config.git + config_repository_branch: devel-2.x config_repository_skip_checkout: false username: "{{ _ce_provision_username }}" install_username: "{{ _ce_provision_username }}" diff --git a/docker-images/controller/Dockerfile b/docker-images/controller/Dockerfile index 6b3b826..7822c85 100644 --- a/docker-images/controller/Dockerfile +++ b/docker-images/controller/Dockerfile @@ -19,7 +19,7 @@ RUN \ /tmp/* -RUN su - ce-dev -c "git clone --branch 2.x https://github.com/codeenigma/ce-provision.git /home/ce-dev/ce-provision" +RUN su - ce-dev -c "git clone --branch 2.x https://gitlab.com/code-enigma/ce-provision.git /home/ce-dev/ce-provision" COPY ./provision.yml /home/ce-dev/ce-provision/provision.yml diff --git a/docker-images/controller/provision.yml b/docker-images/controller/provision.yml index 1cb13e0..9c1dd6c 100644 --- a/docker-images/controller/provision.yml +++ b/docker-images/controller/provision.yml @@ -15,8 +15,8 @@ ce_deploy: venv_path: "/home/{{ _ce_provision_username }}/ansible" venv_command: /usr/bin/python3 -m venv - own_repository: https://github.com/codeenigma/ce-deploy.git - config_repository: https://github.com/codeenigma/ce-dev-ce-deploy-config.git + own_repository: https://gitlab.com/code-enigma/ce-deploy.git + config_repository: https://gitlab.com/code-enigma/ce-dev-ce-deploy-config.git own_repository_branch: 1.x config_repository_branch: 1.x username: ce-dev @@ -39,10 +39,10 @@ ce_provision: venv_path: "/home/{{ _ce_provision_username }}/ansible" venv_command: /usr/bin/python3 -m venv - own_repository: https://github.com/codeenigma/ce-provision.git + own_repository: https://gitlab.com/code-enigma/ce-provision.git own_repository_branch: 2.x own_repository_skip_checkout: false - config_repository: https://github.com/codeenigma/ce-dev-ce-provision-config.git + config_repository: https://gitlab.com/code-enigma/ce-dev-ce-provision-config.git config_repository_branch: 2.x config_repository_skip_checkout: false username: "{{ _ce_provision_username }}" diff --git a/src/commands/provision.ts b/src/commands/provision.ts index a3730b0..2ebcf3c 100644 --- a/src/commands/provision.ts +++ b/src/commands/provision.ts @@ -10,12 +10,12 @@ export default class ProvisionCmd extends AnsibleCmd { branch: Flags.string({ char: 'b', default: '2.x', - description: 'The branch of ce-provision to use for provisioning your containers. See https://github.com/codeenigma/ce-provision for options.' + description: 'The branch of ce-provision to use for provisioning your containers. See https://gitlab.com/code-enigma/ce-provision for options.' }), config: Flags.string({ char: 'c', default: '1.x', - description: 'The branch of the ce-provision-config repository. See https://github.com/codeenigma/ce-dev-ce-provision-config for options.' + description: 'The branch of the ce-provision-config repository. See https://gitlab.com/code-enigma/ce-dev-ce-provision-config for options.' }), interpreter: Flags.string({ char: 'i',