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..6b9708e 100644 --- a/images/base/Dockerfile +++ b/images/base/Dockerfile @@ -1,9 +1,11 @@ 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 UBUNTU_VERSION=20.04 ENV RUNNER_HOME="/home/${USERNAME}/runner" ENV GH_RUNNER_WORKDIR="/home/${USERNAME}"