Skip to content

Commit 93e7af7

Browse files
author
Sean Sundberg
authored
Updates igc and gitu versions with fixes (#11)
Signed-off-by: Sean Sundberg <seansund@us.ibm.com>
1 parent 62518ce commit 93e7af7

2 files changed

Lines changed: 22 additions & 10 deletions

File tree

Dockerfile-alpine

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
ARG TERRAFORM_VERSION=v1.2
2+
ARG BASE_OS=alpine
23
FROM quay.io/cloudnativetoolkit/terraform:${TERRAFORM_VERSION}-v2.0.4-alpine
34

45
ARG TARGETPLATFORM
56
ARG OPENSHIFT_CLI_VERSION=4.10
7+
ARG IGC_VERSION=1.37.3
8+
ARG GITU_VERISON=1.13.5
9+
ARG KUBESEAL_VERSION=0.18.1
10+
ARG ARGOCD_VERSION=2.4.6
11+
ARG KUSTOMIZE_VERSION=4.5.5
612

713
ENV TF_CLI_ARGS_apply="-parallelism=6"
814

@@ -42,17 +48,17 @@ RUN curl -sL -o ./yq3 $(curl -sL https://api.github.com/repos/mikefarah/yq/relea
4248
RUN curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash
4349

4450
## igc
45-
RUN curl -sL -o ./igc https://github.com/cloud-native-toolkit/ibm-garage-cloud-cli/releases/download/v1.37.2/igc-alpine-$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "x64"; fi) && \
51+
RUN curl -sL -o ./igc https://github.com/cloud-native-toolkit/ibm-garage-cloud-cli/releases/download/v${IGC_VERSION}/igc-${BASE_OS}-$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "x64"; fi) && \
4652
chmod +x igc && \
4753
sudo mv igc /usr/local/bin
4854

4955
## gitu
50-
RUN curl -sL -o ./gitu https://github.com/cloud-native-toolkit/git-client/releases/download/v1.13.4/gitu-alpine-$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "x64"; fi) && \
56+
RUN curl -sL -o ./gitu https://github.com/cloud-native-toolkit/git-client/releases/download/v${GITU_VERSION}/gitu-${BASE_OS}-$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "x64"; fi) && \
5157
chmod +x gitu && \
5258
sudo mv gitu /usr/local/bin
5359

5460
## kubeseal
55-
RUN curl -sLo kubeseal.tar.gz https://github.com/bitnami-labs/sealed-secrets/releases/download/v0.18.1/kubeseal-0.18.1-linux-$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi).tar.gz && \
61+
RUN curl -sLo kubeseal.tar.gz https://github.com/bitnami-labs/sealed-secrets/releases/download/v${KUBESEAL_VERSION}/kubeseal-${KUBESEAL_VERSION}-linux-$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi).tar.gz && \
5662
mkdir tmp && \
5763
cd tmp && \
5864
tar xzf ../kubeseal.tar.gz && \
@@ -63,12 +69,12 @@ RUN curl -sLo kubeseal.tar.gz https://github.com/bitnami-labs/sealed-secrets/rel
6369
rm kubeseal.tar.gz
6470

6571
## argocd
66-
RUN curl -sLo argocd https://github.com/argoproj/argo-cd/releases/download/v2.4.6/argocd-linux-$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi) && \
72+
RUN curl -sLo argocd https://github.com/argoproj/argo-cd/releases/download/v${ARGOCD_VERSION}/argocd-linux-$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi) && \
6773
chmod +x argocd && \
6874
sudo mv argocd /usr/local/bin
6975

7076
## kustomize
71-
RUN curl -sLo kustomize.tar.gz https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv4.5.5/kustomize_v4.5.5_linux_$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi).tar.gz && \
77+
RUN curl -sLo kustomize.tar.gz https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv${KUSTOMIZE_VERSION}/kustomize_v${KUSTOMIZE_VERSION}_linux_$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi).tar.gz && \
7278
mkdir tmp && \
7379
cd tmp && \
7480
tar xzf ../kustomize.tar.gz && \

Dockerfile-fedora

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
ARG TERRAFORM_VERSION=v1.2
2+
ARG BASE_OS=linux
23
FROM quay.io/cloudnativetoolkit/terraform:${TERRAFORM_VERSION}-v2.0.4-fedora
34

45
ARG TARGETPLATFORM
56
ARG OPENSHIFT_CLI_VERSION=4.10
7+
ARG IGC_VERSION=1.37.3
8+
ARG GITU_VERISON=1.13.5
9+
ARG KUBESEAL_VERSION=0.18.1
10+
ARG ARGOCD_VERSION=2.4.6
11+
ARG KUSTOMIZE_VERSION=4.5.5
612

713
ENV TF_CLI_ARGS_apply="-parallelism=6"
814

@@ -46,17 +52,17 @@ RUN curl -sL -o ./helm.tar.gz https://get.helm.sh/helm-v3.8.2-linux-$(if [[ "$TA
4652
rm ./helm.tar.gz
4753

4854
## igc
49-
RUN curl -sL -o ./igc https://github.com/cloud-native-toolkit/ibm-garage-cloud-cli/releases/download/v1.37.2/igc-linux-$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "x64"; fi) && \
55+
RUN curl -sL -o ./igc https://github.com/cloud-native-toolkit/ibm-garage-cloud-cli/releases/download/v${IGC_VERSION}/igc-${BASE_OS}-$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "x64"; fi) && \
5056
chmod +x igc && \
5157
sudo mv igc /usr/local/bin
5258

5359
## gitu
54-
RUN curl -sL -o ./gitu https://github.com/cloud-native-toolkit/git-client/releases/download/v1.13.4/gitu-linux-$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "x64"; fi) && \
60+
RUN curl -sL -o ./gitu https://github.com/cloud-native-toolkit/git-client/releases/download/v${GITU_VERSION}/gitu-${BASE_OS}-$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "x64"; fi) && \
5561
chmod +x gitu && \
5662
sudo mv gitu /usr/local/bin
5763

5864
## kubeseal
59-
RUN curl -sLo kubeseal.tar.gz https://github.com/bitnami-labs/sealed-secrets/releases/download/v0.18.1/kubeseal-0.18.1-linux-$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi).tar.gz && \
65+
RUN curl -sLo kubeseal.tar.gz https://github.com/bitnami-labs/sealed-secrets/releases/download/v${KUBESEAL_VERSION}/kubeseal-${KUBESEAL_VERSION}-linux-$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi).tar.gz && \
6066
mkdir tmp && \
6167
cd tmp && \
6268
tar xzf ../kubeseal.tar.gz && \
@@ -67,12 +73,12 @@ RUN curl -sLo kubeseal.tar.gz https://github.com/bitnami-labs/sealed-secrets/rel
6773
rm kubeseal.tar.gz
6874

6975
## argocd
70-
RUN curl -sLo argocd https://github.com/argoproj/argo-cd/releases/download/v2.4.6/argocd-linux-$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi) && \
76+
RUN curl -sLo argocd https://github.com/argoproj/argo-cd/releases/download/v${ARGOCD_VERSION}/argocd-linux-$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi) && \
7177
chmod +x argocd && \
7278
sudo mv argocd /usr/local/bin
7379

7480
## kustomize
75-
RUN curl -sLo kustomize.tar.gz https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv4.5.5/kustomize_v4.5.5_linux_$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi).tar.gz && \
81+
RUN curl -sLo kustomize.tar.gz https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv${KUSTOMIZE_VERSION}/kustomize_v${KUSTOMIZE_VERSION}_linux_$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi).tar.gz && \
7682
mkdir tmp && \
7783
cd tmp && \
7884
tar xzf ../kustomize.tar.gz && \

0 commit comments

Comments
 (0)