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 diff --git a/dockerfile b/dockerfile index d7eee01..4ac4ee4 100644 --- a/dockerfile +++ b/dockerfile @@ -1,4 +1,6 @@ -ARG TARGETPLATFORM=linux/amd64 + +FROM --platform=$TARGETPLATFORM quay.io/ansible/receptor:devel as receptor + FROM --platform=$TARGETPLATFORM python:3.11-bullseye @@ -71,20 +73,22 @@ 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 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/includes/etc/ansible/roles b/includes/etc/ansible/roles index 72f7f02..cacc05e 160000 --- a/includes/etc/ansible/roles +++ b/includes/etc/ansible/roles @@ -1 +1 @@ -Subproject commit 72f7f029e9245005e2b2a85aeae4f0252f56315a +Subproject commit cacc05eb2ae5d51be3a8d8abaf7dbc6e2abc98d7 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