Merge pull request #24 from fullstack-devops/bugfix/add-ansible-to-fullstacked

add ansible to fullstacked

Author: eksrha

images/ansible-k8s/Dockerfile

@@ -52,7 +52,7 @@ USER ${USERNAME}
 
 RUN pip3 install ${PACKAGES_PYTHON} --user
 
-RUN ansible-galaxy install -c -r ${TMP_DIR}/requirements.yml
+# RUN ansible-galaxy install -c -r ${TMP_DIR}/requirements.yml
 RUN ansible-galaxy collection install -c -r ${TMP_DIR}/requirements.yml
 
 # install helm plugins helm push, appr && diff

images/ansible-k8s/requirements.yml

@@ -1,8 +1,4 @@
 ---
-roles:
-  - name: geerlingguy.helm
-    version: 1.0.1
-
 collections:
   - name: kubernetes.core
-    version: 2.2.2
+    version: 2.3.1

images/base/Dockerfile

@@ -2,7 +2,7 @@ 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 software-properties-common jq sed grep git curl wget zip python3-pip "
+ARG PACKAGES="libffi-dev libicu-dev build-essential libssl-dev ca-certificates software-properties-common jq sed grep git curl wget zip python3-pip"
 
 ENV USERNAME="runner"
 ENV UBUNTU_VERSION=20.04

images/fullstacked/Dockerfile

@@ -3,15 +3,17 @@ 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="openjdk-11-jdk maven nodejs"
+ARG PACKAGES="openjdk-11-jdk maven nodejs ansible"
+ARG PACKAGES_PYTHON="kubernetes"
 
 RUN apt-get update \
+  && add-apt-repository -y --update ppa:ansible/ansible \
   && curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - \
   && apt-get install -y --no-install-recommends ${PACKAGES} \
   && rm -rf /var/lib/apt/lists/* \
   && apt-get clean
 
-ENV GH_RUNNER_LABELS="ubuntu-20.04,maven,openjdk-11,nodejs,go,yarn,helm"
+ENV GH_RUNNER_LABELS="ubuntu-20.04,maven,openjdk-11,nodejs,go,yarn,helm,ansible"
 # https://github.com/helm/helm/releases
 ARG HELM_VERSION=3.8.1
 # https://go.dev/dl/
@@ -29,13 +31,27 @@ RUN export ARCH=$(/helper-scripts/translate-aarch.sh a-short) \
   && rm -rf /usr/local/src/go.linux.tar.gz \
   && ln -s /usr/local/src/go/bin/go /usr/local/bin/
 
-# install npm tools: yarn
-RUN npm install --global yarn @angular/cli@13
+
+ENV TMP_DIR=/home/${USERNAME}/tmp
+
+RUN mkdir /home/${USERNAME}/.ansible
+RUN mkdir ${TMP_DIR}
+
+COPY requirements.yml ${TMP_DIR}/requirements.yml
 
 RUN mkdir -p /home/${USERNAME}/.m2/ \
   && chown -R ${USERNAME} /home/${USERNAME}
+
+# install npm tools: yarn
+RUN npm install --global yarn @angular/cli@13
+
 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
+
 # install helm plugins helm push, appr && diff
 RUN helm plugin install --version 0.10.2 https://github.com/chartmuseum/helm-push.git \
   && helm plugin install --version 0.7.0 https://github.com/app-registry/appr-helm-plugin.git \

images/fullstacked/requirements.yml

@@ -0,0 +1,4 @@
+---
+collections:
+  - name: kubernetes.core
+    version: 2.3.1