From e0f235105dd8e118b02570da87f5101fa8be8784 Mon Sep 17 00:00:00 2001 From: gregharvey Date: Fri, 14 Apr 2023 15:51:39 +0200 Subject: [PATCH 1/4] Fixing ce_provision vars in container builds. --- docker-images/controller-ci/provision.yml | 3 +++ docker-images/controller/provision.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/docker-images/controller-ci/provision.yml b/docker-images/controller-ci/provision.yml index a385bf8..5a44df5 100644 --- a/docker-images/controller-ci/provision.yml +++ b/docker-images/controller-ci/provision.yml @@ -18,5 +18,8 @@ local_dir: /home/controller/ce-provision groups: [] galaxy_custom_requirements_file: "" + galaxy_roles_directory: "/home/{{ _ce_provision.username }}/.ansible/roles" + upgrade_galaxy: + enabled: false roles: - ce_provision diff --git a/docker-images/controller/provision.yml b/docker-images/controller/provision.yml index e26cd51..324436d 100644 --- a/docker-images/controller/provision.yml +++ b/docker-images/controller/provision.yml @@ -30,6 +30,9 @@ local_dir: /home/ce-dev/ce-provision groups: [] galaxy_custom_requirements_file: "" + galaxy_roles_directory: "/home/{{ _ce_provision.username }}/.ansible/roles" + upgrade_galaxy: + enabled: false roles: - ce_provision - ce_deploy From 1850ca1074ce52f0dea913482f527e269af0517d Mon Sep 17 00:00:00 2001 From: gregharvey Date: Fri, 14 Apr 2023 16:04:29 +0200 Subject: [PATCH 2/4] Fixing ce_deploy vars in container builds. --- docker-images/controller/provision.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker-images/controller/provision.yml b/docker-images/controller/provision.yml index 324436d..b58da35 100644 --- a/docker-images/controller/provision.yml +++ b/docker-images/controller/provision.yml @@ -17,6 +17,9 @@ key_name: id_rsa.pub local_dir: /home/ce-dev/ce-deploy groups: [] + galaxy_custom_requirements_file: "" + upgrade_galaxy: + enabled: false - ce_provision: own_repository: https://github.com/codeenigma/ce-provision.git own_repository_branch: 1.x From e2525cb3b6ceb351b0ffe320efd4fe2b223be197 Mon Sep 17 00:00:00 2001 From: gregharvey Date: Fri, 14 Apr 2023 16:16:25 +0200 Subject: [PATCH 3/4] Adding the option to build manually the containers. --- .github/workflows/ce-dev-build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ce-dev-build.yml b/.github/workflows/ce-dev-build.yml index d9c3601..da625f6 100644 --- a/.github/workflows/ce-dev-build.yml +++ b/.github/workflows/ce-dev-build.yml @@ -5,6 +5,9 @@ on: push: tags: - 1.* + workflow_dispatch: + tags: + - 1.* jobs: build: From aab8cdbee5d8d2a3c56181352075554a0496aa46 Mon Sep 17 00:00:00 2001 From: gregharvey Date: Fri, 14 Apr 2023 16:28:45 +0200 Subject: [PATCH 4/4] Still missing some vars. --- docker-images/controller-ci/provision.yml | 2 ++ docker-images/controller/provision.yml | 3 +++ 2 files changed, 5 insertions(+) diff --git a/docker-images/controller-ci/provision.yml b/docker-images/controller-ci/provision.yml index 5a44df5..6527f4f 100644 --- a/docker-images/controller-ci/provision.yml +++ b/docker-images/controller-ci/provision.yml @@ -5,6 +5,8 @@ - _domain_name: ci.example.com - _ce_provision_build_tmp_dir: /tmp - _ce_provision_data_dir: /tmp + - _ce_provision: + username: ce-dev - is_local: true - _env_type: utility - ce_provision: diff --git a/docker-images/controller/provision.yml b/docker-images/controller/provision.yml index b58da35..3faaf4d 100644 --- a/docker-images/controller/provision.yml +++ b/docker-images/controller/provision.yml @@ -5,6 +5,8 @@ - _domain_name: example.com - _ce_provision_build_tmp_dir: /tmp - _ce_provision_data_dir: /tmp + - _ce_provision: + username: ce-dev - is_local: true - _env_type: utility - ce_deploy: @@ -16,6 +18,7 @@ new_user: true key_name: id_rsa.pub local_dir: /home/ce-dev/ce-deploy + ce_provision_dir: "/home/ce-dev/ce-provision" groups: [] galaxy_custom_requirements_file: "" upgrade_galaxy: