Skip to content
This repository was archived by the owner on Feb 11, 2025. It is now read-only.

Commit d6bb7d7

Browse files
committed
add kubernetes.core to fullstacked
1 parent 81b6646 commit d6bb7d7

File tree

4 files changed

+23
-8
lines changed

4 files changed

+23
-8
lines changed

images/ansible-k8s/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ USER ${USERNAME}
5252

5353
RUN pip3 install ${PACKAGES_PYTHON} --user
5454

55-
RUN ansible-galaxy install -c -r ${TMP_DIR}/requirements.yml
55+
# RUN ansible-galaxy install -c -r ${TMP_DIR}/requirements.yml
5656
RUN ansible-galaxy collection install -c -r ${TMP_DIR}/requirements.yml
5757

5858
# install helm plugins helm push, appr && diff
Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
---
2-
roles:
3-
- name: geerlingguy.helm
4-
version: 1.0.1
5-
62
collections:
73
- name: kubernetes.core
8-
version: 2.2.2
4+
version: 2.3.1

images/fullstacked/Dockerfile

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ USER root
44
# install packages along with jq so we can parse JSON
55
# add additional packages as necessary
66
ARG PACKAGES="openjdk-11-jdk maven nodejs ansible"
7+
ARG PACKAGES_PYTHON="kubernetes"
78

89
RUN apt-get update \
910
&& add-apt-repository -y --update ppa:ansible/ansible \
@@ -30,13 +31,27 @@ RUN export ARCH=$(/helper-scripts/translate-aarch.sh a-short) \
3031
&& rm -rf /usr/local/src/go.linux.tar.gz \
3132
&& ln -s /usr/local/src/go/bin/go /usr/local/bin/
3233

33-
# install npm tools: yarn
34-
RUN npm install --global yarn @angular/cli@13
34+
35+
ENV TMP_DIR=/home/${USERNAME}/tmp
36+
37+
RUN mkdir /home/${USERNAME}/.ansible
38+
RUN mkdir ${TMP_DIR}
39+
40+
COPY requirements.yml ${TMP_DIR}/requirements.yml
3541

3642
RUN mkdir -p /home/${USERNAME}/.m2/ \
3743
&& chown -R ${USERNAME} /home/${USERNAME}
44+
45+
# install npm tools: yarn
46+
RUN npm install --global yarn @angular/cli@13
47+
3848
USER ${USERNAME}
3949

50+
RUN pip3 install ${PACKAGES_PYTHON} --user
51+
52+
# RUN ansible-galaxy install -c -r ${TMP_DIR}/requirements.yml
53+
RUN ansible-galaxy collection install -c -r ${TMP_DIR}/requirements.yml
54+
4055
# install helm plugins helm push, appr && diff
4156
RUN helm plugin install --version 0.10.2 https://github.com/chartmuseum/helm-push.git \
4257
&& helm plugin install --version 0.7.0 https://github.com/app-registry/appr-helm-plugin.git \
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
collections:
3+
- name: kubernetes.core
4+
version: 2.3.1

0 commit comments

Comments
 (0)