From 28fbff63a60ccbfa24e600f3c3c93b409e8dba2b Mon Sep 17 00:00:00 2001 From: nfc_bot Date: Sun, 12 Nov 2023 05:08:45 +0000 Subject: [PATCH 1/7] feat(ansible-roles): updated submodule ansible-roles Automation Data: { "branch": "development", "current_commit": "72f7f029e9245005e2b2a85aeae4f0252f56315a)", "name": "ansible-roles", "path": "/builds/nofusscomputing/projects/ansible/execution_environment/_automation_/includes/etc/ansible/roles", "remote_head": "d1d60b2c1754a6a1e4d0d98159b0221731eb5e40)", "remote_name": "origin", "url": "https://gitlab.com/nofusscomputing/projects/ansible/ansible-roles.git" } Changes: Submodule path includes/etc/ansible/roles: checked out d1d60b2c1754a6a1e4d0d98159b0221731eb5e40 MR !112 --- includes/etc/ansible/roles | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/etc/ansible/roles b/includes/etc/ansible/roles index 72f7f02..d1d60b2 160000 --- a/includes/etc/ansible/roles +++ b/includes/etc/ansible/roles @@ -1 +1 @@ -Subproject commit 72f7f029e9245005e2b2a85aeae4f0252f56315a +Subproject commit d1d60b2c1754a6a1e4d0d98159b0221731eb5e40 -- 2.49.0 From db366e7b8ea7ecff10942df89f7cac8bede2e62f Mon Sep 17 00:00:00 2001 From: nfc_bot Date: Mon, 13 Nov 2023 08:47:09 +0000 Subject: [PATCH 2/7] feat(ansible-roles): updated submodule ansible-roles Automation Data: { "branch": "development", "current_commit": "d1d60b2c1754a6a1e4d0d98159b0221731eb5e40)", "name": "ansible-roles", "path": "/builds/nofusscomputing/projects/ansible/execution_environment/_automation_/includes/etc/ansible/roles", "remote_head": "988fc876e98bdebdf1b0aa8074da822b8230bbf9)", "remote_name": "origin", "url": "https://gitlab.com/nofusscomputing/projects/ansible/ansible-roles.git" } Changes: Submodule path includes/etc/ansible/roles: checked out 988fc876e98bdebdf1b0aa8074da822b8230bbf9 MR !113 --- includes/etc/ansible/roles | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/etc/ansible/roles b/includes/etc/ansible/roles index d1d60b2..988fc87 160000 --- a/includes/etc/ansible/roles +++ b/includes/etc/ansible/roles @@ -1 +1 @@ -Subproject commit d1d60b2c1754a6a1e4d0d98159b0221731eb5e40 +Subproject commit 988fc876e98bdebdf1b0aa8074da822b8230bbf9 -- 2.49.0 From 005a2932886cf57685d9d7764615cafae6b4a456 Mon Sep 17 00:00:00 2001 From: nfc_bot Date: Mon, 13 Nov 2023 13:00:32 +0000 Subject: [PATCH 3/7] feat(ansible-roles): updated submodule ansible-roles Automation Data: { "branch": "development", "current_commit": "988fc876e98bdebdf1b0aa8074da822b8230bbf9)", "name": "ansible-roles", "path": "/builds/nofusscomputing/projects/ansible/execution_environment/_automation_/includes/etc/ansible/roles", "remote_head": "cacc05eb2ae5d51be3a8d8abaf7dbc6e2abc98d7)", "remote_name": "origin", "url": "https://gitlab.com/nofusscomputing/projects/ansible/ansible-roles.git" } Changes: Submodule path includes/etc/ansible/roles: checked out cacc05eb2ae5d51be3a8d8abaf7dbc6e2abc98d7 MR !113 --- includes/etc/ansible/roles | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/etc/ansible/roles b/includes/etc/ansible/roles index 988fc87..cacc05e 160000 --- a/includes/etc/ansible/roles +++ b/includes/etc/ansible/roles @@ -1 +1 @@ -Subproject commit 988fc876e98bdebdf1b0aa8074da822b8230bbf9 +Subproject commit cacc05eb2ae5d51be3a8d8abaf7dbc6e2abc98d7 -- 2.49.0 From 2d54a3cc28280383b0879349d9607775fe9892c5 Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 14 Nov 2023 20:43:31 +0930 Subject: [PATCH 4/7] feat(ansible): add community.dns module !114 --- dockerfile | 8 ++++---- requirements.txt | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dockerfile b/dockerfile index d7eee01..a915503 100644 --- a/dockerfile +++ b/dockerfile @@ -78,13 +78,13 @@ RUN pip install --index-url https://gitlab.com/api/v4/projects/45741845/packages RUN ansible-galaxy collection install \ + awx.awx \ # ansible.posix.authorized_key for SSH ansible.posix \ - awx.awx \ - # community.general.gitlab_* - community.general \ + community.dns \ # docker managment community.docker \ + # community.general.gitlab_* + community.general \ community.mysql \ - community.postgresql \ kubernetes.core \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 2b8c3ce..94a925b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,3 +8,5 @@ python_gitlab==3.14.0 psycopg2==2.9.9 # community.mysql PyMySQL==1.1.0 + +dnspython \ No newline at end of file -- 2.49.0 From 8e96e160739090d428f482c160bc82e9855b865f Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 14 Nov 2023 20:44:11 +0930 Subject: [PATCH 5/7] feat(container): add ansible receptor !114 closes #17 --- dockerfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dockerfile b/dockerfile index a915503..883a9d4 100644 --- a/dockerfile +++ b/dockerfile @@ -1,5 +1,9 @@ ARG TARGETPLATFORM=linux/amd64 + +FROM --platform=$TARGETPLATFORM quay.io/ansible/receptor:devel as receptor + + FROM --platform=$TARGETPLATFORM python:3.11-bullseye # Ansible chucks a wobbler without. see: https://github.com/ansible/ansible/issues/78283 @@ -71,8 +75,10 @@ WORKDIR /workdir COPY requirements.txt /tmp/requirements.txt +COPY --from=receptor /usr/bin/receptor /usr/bin/receptor -RUN pip install --upgrade pip +RUN pip install --upgrade pip; \ + mkdir -p /var/run/receptor RUN pip install --index-url https://gitlab.com/api/v4/projects/45741845/packages/pypi/simple -r /tmp/requirements.txt -- 2.49.0 From 102c50df52d398ead8415877fd2067436a1ee8d1 Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 14 Nov 2023 21:11:39 +0930 Subject: [PATCH 6/7] fix(multi_arch_cpu): ensure multi arch images are build !116 --- dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/dockerfile b/dockerfile index 883a9d4..4ac4ee4 100644 --- a/dockerfile +++ b/dockerfile @@ -1,5 +1,3 @@ -ARG TARGETPLATFORM=linux/amd64 - FROM --platform=$TARGETPLATFORM quay.io/ansible/receptor:devel as receptor -- 2.49.0 From dbddb3b4334857733d3f1b044f64ea8c745bab7c Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 14 Nov 2023 21:14:52 +0930 Subject: [PATCH 7/7] feat(arm32): remove arm 32-bit support !116 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 557f178..70ccb31 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ variables: MY_PROJECT_ID: "45741845" GIT_SYNC_URL: "https://$GITHUB_USERNAME_ROBOT:$GITHUB_TOKEN_ROBOT@github.com/NoFussComputing/execution_environment.git" - DOCKER_IMAGE_BUILD_TARGET_PLATFORMS: "linux/amd64,linux/arm64,linux/arm/v7" + DOCKER_IMAGE_BUILD_TARGET_PLATFORMS: "linux/amd64,linux/arm64" DOCKER_IMAGE_PUBLISH_NAME: 'ansible-ee' DOCKER_IMAGE_PUBLISH_REGISTRY: docker.io/nofusscomputing DOCKER_IMAGE_PUBLISH_URL: https://hub.docker.com/r/nofusscomputing/$DOCKER_IMAGE_PUBLISH_NAME -- 2.49.0