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

Commit 72a1bfa

Browse files
authored
Merge pull request #10 from fullstack-devops/bugfix/update-clean
update all dependencies
2 parents 90b919a + c9a0dc3 commit 72a1bfa

File tree

4 files changed

+15
-12
lines changed

4 files changed

+15
-12
lines changed

images/ansible-k8s/Dockerfile

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,19 @@ RUN apt-get update \
1111
&& apt-get clean
1212

1313
ENV GH_RUNNER_LABELS="ubuntu-20.04,ansible-k8s"
14-
ARG KUBECTL_VERSION=1.21.0
15-
ARG HELM_VERSION=3.6.3
14+
# https://github.com/kubernetes/kubernetes/releases/
15+
ARG KUBECTL_VERSION=1.23.5
16+
# https://github.com/helm/helm/releases
17+
ARG HELM_VERSION=3.8.1
1618

1719
# Install kubectl
18-
RUN wget -q https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl -O /usr/local/bin/kubectl \
20+
RUN export ARCH=$(/helper-scripts/translate-aarch.sh a-short) \
21+
&& wget -q https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/${ARCH}/kubectl -O /usr/local/bin/kubectl \
1922
&& chmod +x /usr/local/bin/kubectl
2023

2124
# Install helm
22-
RUN wget -q https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz -O - | tar -xzO linux-amd64/helm > /usr/local/bin/helm \
25+
RUN export ARCH=$(/helper-scripts/translate-aarch.sh a-short) \
26+
&& wget -q https://get.helm.sh/helm-v${HELM_VERSION}-linux-${ARCH}.tar.gz -O - | tar -xzO linux-${ARCH}/helm > /usr/local/bin/helm \
2327
&& chmod +x /usr/local/bin/helm
2428

2529
ENV TMP_DIR=/home/${USERNAME}/tmp

images/ansible-k8s/requirements.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
---
22
roles:
33
- name: geerlingguy.helm
4-
version: 1.0.0
4+
version: 1.0.1
55

66
collections:
77
- name: kubernetes.core
8-
version: 1.2.0
9-
10-
- name: community.kubernetes
11-
version: 1.0.0
8+
version: 2.2.2

images/base/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ENV GH_KANIKO_WORKDIR="/kaniko/workspace"
1313
ENV GH_RUNNER_VERSION=2.289.2
1414
ENV GH_RUNNER_LABELS=ubuntu-20.04
1515

16-
ENV AWESOME_CI_VERSION 0.11.2
16+
ENV AWESOME_CI_VERSION 0.11.3
1717

1818
# making nessecarry directories
1919
RUN mkdir /helper-scripts \

images/fullstacked/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ RUN apt-get update \
1212
&& apt-get clean
1313

1414
ENV GH_RUNNER_LABELS="ubuntu-20.04,maven,openjdk-11,nodejs,go,yarn,helm"
15-
ARG HELM_VERSION=3.6.3
16-
ARG GO_VERSION=1.17.3
15+
# https://github.com/helm/helm/releases
16+
ARG HELM_VERSION=3.8.1
17+
# https://go.dev/dl/
18+
ARG GO_VERSION=1.18
1719

1820
# Install helm
1921
RUN export ARCH=$(/helper-scripts/translate-aarch.sh a-short) \

0 commit comments

Comments
 (0)