From ee6fa10478a1d74104706f6aec1b3ec4e5fed17e Mon Sep 17 00:00:00 2001
From: eksrha <58111764+eksrha@users.noreply.github.com>
Date: Fri, 22 Apr 2022 13:31:28 +0200
Subject: [PATCH 1/2] add python to base + skopeo to ansible-k8s

---
 images/ansible-k8s/Dockerfile | 8 +++++++-
 images/base/Dockerfile        | 3 ++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/images/ansible-k8s/Dockerfile b/images/ansible-k8s/Dockerfile
index d42b1c0..fa01e4a 100644
--- a/images/ansible-k8s/Dockerfile
+++ b/images/ansible-k8s/Dockerfile
@@ -3,7 +3,11 @@ FROM ghcr.io/fullstack-devops/github-actions-runner:base-latest
 USER root
 # install packages along with jq so we can parse JSON
 # add additional packages as necessary
-ARG PACKAGES="ansible"
+ARG PACKAGES="ansible skopeo"
+ARG PACKAGES_PYTHON="kubernetes"
+
+RUN echo "deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${UBUNTU_VERSION}/ /" | tee /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list
+RUN curl -fsSL https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/xUbuntu_${UBUNTU_VERSION}/Release.key | gpg --dearmor | tee /etc/apt/trusted.gpg.d/devel_kubic_libcontainers_stable.gpg > /dev/null
 
 RUN apt-get update \
   && apt-get install -y --no-install-recommends ${PACKAGES} \
@@ -37,6 +41,8 @@ RUN chown -R ${USERNAME} /home/${USERNAME}
 
 USER ${USERNAME}
 
+RUN pip3 install ${PACKAGES_PYTHON} --user
+
 RUN ansible-galaxy install -c -r ${TMP_DIR}/requirements.yml
 RUN ansible-galaxy collection install -c -r ${TMP_DIR}/requirements.yml
 
diff --git a/images/base/Dockerfile b/images/base/Dockerfile
index 2cf2de3..7047ec1 100644
--- a/images/base/Dockerfile
+++ b/images/base/Dockerfile
@@ -1,7 +1,8 @@
 FROM ubuntu:20.04
 
+ARG UBUNTU_VERSION=20.04
 ARG DEBIAN_FRONTEND=noninteractive
-ARG PACKAGES="libffi-dev libicu-dev build-essential libssl-dev ca-certificates jq sed grep git curl wget zip"
+ARG PACKAGES="libffi-dev libicu-dev build-essential libssl-dev ca-certificates jq sed grep git curl wget zip python3-pip"
 
 ENV USERNAME="runner"
 ENV RUNNER_HOME="/home/${USERNAME}/runner"

From 88020ece0b1d2ebe65156af16273821e3c3771db Mon Sep 17 00:00:00 2001
From: eksrha <58111764+eksrha@users.noreply.github.com>
Date: Fri, 22 Apr 2022 13:43:47 +0200
Subject: [PATCH 2/2] add UBUNTU_VERSION as ENV

---
 images/base/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/images/base/Dockerfile b/images/base/Dockerfile
index 7047ec1..6b9708e 100644
--- a/images/base/Dockerfile
+++ b/images/base/Dockerfile
@@ -5,6 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 ARG PACKAGES="libffi-dev libicu-dev build-essential libssl-dev ca-certificates jq sed grep git curl wget zip python3-pip"
 
 ENV USERNAME="runner"
+ENV UBUNTU_VERSION=20.04
 ENV RUNNER_HOME="/home/${USERNAME}/runner"
 
 ENV GH_RUNNER_WORKDIR="/home/${USERNAME}"