From 03342e41c591f58c214f1c8754a069362618515d Mon Sep 17 00:00:00 2001 From: Jon Date: Fri, 20 Oct 2023 06:29:54 +0930 Subject: [PATCH 1/5] feat(collection): add community.postgresql !95 --- dockerfile | 11 ++++++----- requirements.txt | 4 +++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dockerfile b/dockerfile index 109ac2c..41b713d 100644 --- a/dockerfile +++ b/dockerfile @@ -71,12 +71,13 @@ RUN pip install --index-url https://gitlab.com/api/v4/projects/45741845/packages RUN ansible-galaxy collection install \ - awx.awx \ - kubernetes.core \ - # community.general.gitlab_* - community.general \ # ansible.posix.authorized_key for SSH ansible.posix \ + awx.awx \ + # community.general.gitlab_* + community.general \ # docker managment community.docker \ - community.mysql \ No newline at end of file + community.mysql \ + community.postgresql \ + kubernetes.core \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 44dc928..b8fc15e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,4 +3,6 @@ ansible-lint==6.15.0 ansible-runner==2.3.4 # Required for community.general.gitlab_* -python_gitlab==3.14.0 \ No newline at end of file +python_gitlab==3.14.0 +# community.postgresql +psycopg2==2.9.9 -- 2.49.0 From a34d0736714a0c487806872b78dcb78474c621ae Mon Sep 17 00:00:00 2001 From: Jon Date: Fri, 20 Oct 2023 06:31:26 +0930 Subject: [PATCH 2/5] feat(image): add postgresclient !95 --- dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dockerfile b/dockerfile index 41b713d..3a83679 100644 --- a/dockerfile +++ b/dockerfile @@ -48,6 +48,8 @@ RUN apt update \ openssh-client \ git \ sshpass \ + postgresql-common \ + postgresql-client \ && mkdir -p /etc/ansible/roles \ && mkdir -p /etc/ansible/collections \ && mkdir -p /workdir \ -- 2.49.0 From e38f0e58b3d6c4e537186f428a6ff372b4bdc07c Mon Sep 17 00:00:00 2001 From: Jon Date: Fri, 20 Oct 2023 06:31:53 +0930 Subject: [PATCH 3/5] feat(image): add mysql client !95 --- dockerfile | 1 + requirements.txt | 2 ++ 2 files changed, 3 insertions(+) diff --git a/dockerfile b/dockerfile index 3a83679..5e6c07f 100644 --- a/dockerfile +++ b/dockerfile @@ -50,6 +50,7 @@ RUN apt update \ sshpass \ postgresql-common \ postgresql-client \ + mariadb-client \ && mkdir -p /etc/ansible/roles \ && mkdir -p /etc/ansible/collections \ && mkdir -p /workdir \ diff --git a/requirements.txt b/requirements.txt index b8fc15e..2b8c3ce 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,3 +6,5 @@ ansible-runner==2.3.4 python_gitlab==3.14.0 # community.postgresql psycopg2==2.9.9 +# community.mysql +PyMySQL==1.1.0 -- 2.49.0 From 03f00a928906e50f580a1e8f2ca3f3b79089e3c3 Mon Sep 17 00:00:00 2001 From: Jon Date: Sat, 21 Oct 2023 11:47:14 +0930 Subject: [PATCH 4/5] feat(image): var ANSIBLE_COLLECTIONS_PATHS set to /etc/ansible/collections !95 --- dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dockerfile b/dockerfile index 5e6c07f..9398c8c 100644 --- a/dockerfile +++ b/dockerfile @@ -7,6 +7,8 @@ ENV DEBIAN_FRONTEND noninteractive ENV ANSIBLE_PLAYBOOK_DIR=/etc/ansible/playbooks +ENV ANSIBLE_COLLECTIONS_PATHS=/etc/ansible/collections + COPY includes / -- 2.49.0 From b8aea8f847d0d0d6b176991cad167bc6ea6f9d14 Mon Sep 17 00:00:00 2001 From: Jon Date: Sat, 21 Oct 2023 11:47:29 +0930 Subject: [PATCH 5/5] feat(image): default to amd64 as target platform !95 --- dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dockerfile b/dockerfile index 9398c8c..d7eee01 100644 --- a/dockerfile +++ b/dockerfile @@ -1,3 +1,5 @@ +ARG TARGETPLATFORM=linux/amd64 + FROM --platform=$TARGETPLATFORM python:3.11-bullseye # Ansible chucks a wobbler without. see: https://github.com/ansible/ansible/issues/78283 -- 2.49.0