Skip to content

Commit decb1c8

Browse files
author
Sean Sundberg
authored
Fixes broken gitu and igc clis (#12)
Signed-off-by: Sean Sundberg <seansund@us.ibm.com>
1 parent 93e7af7 commit decb1c8

2 files changed

Lines changed: 35 additions & 20 deletions

File tree

‎Dockerfile-alpine‎

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

54
ARG TARGETPLATFORM
5+
ARG BASE_OS=alpine
66
ARG OPENSHIFT_CLI_VERSION=4.10
77
ARG IGC_VERSION=1.37.3
8-
ARG GITU_VERISON=1.13.5
8+
ARG GITU_VERSION=1.13.5
99
ARG KUBESEAL_VERSION=0.18.1
1010
ARG ARGOCD_VERSION=2.4.6
1111
ARG KUSTOMIZE_VERSION=4.5.5
@@ -39,23 +39,27 @@ RUN curl -L https://mirror.openshift.com/pub/openshift-v4/$(if [[ "$TARGETPLATFO
3939

4040
RUN curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi)/kubectl" && \
4141
chmod +x ./kubectl && \
42-
sudo mv ./kubectl /usr/local/bin
42+
sudo mv ./kubectl /usr/local/bin && \
43+
kubectl version --client
4344

4445
RUN curl -sL -o ./yq3 $(curl -sL https://api.github.com/repos/mikefarah/yq/releases/tags/3.4.1 | jq -r --arg NAME "yq_linux_$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi)" '.assets[] | select(.name == $NAME) | .browser_download_url') && \
4546
chmod +x ./yq3 && \
46-
sudo mv ./yq3 /usr/bin/yq3
47+
sudo mv ./yq3 /usr/bin/yq3 && \
48+
yq3 --version
4749

48-
RUN curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash
50+
RUN curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash && helm version
4951

5052
## igc
5153
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) && \
5254
chmod +x igc && \
53-
sudo mv igc /usr/local/bin
55+
sudo mv igc /usr/local/bin && \
56+
igc --version
5457

5558
## gitu
5659
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) && \
5760
chmod +x gitu && \
58-
sudo mv gitu /usr/local/bin
61+
sudo mv gitu /usr/local/bin && \
62+
gitu --version
5963

6064
## kubeseal
6165
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 && \
@@ -66,12 +70,14 @@ RUN curl -sLo kubeseal.tar.gz https://github.com/bitnami-labs/sealed-secrets/rel
6670
sudo mv kubeseal /usr/local/bin && \
6771
cd .. && \
6872
rm -rf tmp && \
69-
rm kubeseal.tar.gz
73+
rm kubeseal.tar.gz && \
74+
kubeseal --version
7075

7176
## argocd
7277
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) && \
7378
chmod +x argocd && \
74-
sudo mv argocd /usr/local/bin
79+
sudo mv argocd /usr/local/bin && \
80+
argocd version --client
7581

7682
## kustomize
7783
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 && \
@@ -81,7 +87,8 @@ RUN curl -sLo kustomize.tar.gz https://github.com/kubernetes-sigs/kustomize/rele
8187
sudo mv kustomize /usr/local/bin && \
8288
cd .. && \
8389
rm -rf tmp && \
84-
rm kustomize.tar.gz
90+
rm kustomize.tar.gz && \
91+
kustomize version
8592

8693
VOLUME /workspaces
8794

‎Dockerfile-fedora‎

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

54
ARG TARGETPLATFORM
5+
ARG BASE_OS=linux
66
ARG OPENSHIFT_CLI_VERSION=4.10
77
ARG IGC_VERSION=1.37.3
8-
ARG GITU_VERISON=1.13.5
8+
ARG GITU_VERSION=1.13.5
99
ARG KUBESEAL_VERSION=0.18.1
1010
ARG ARGOCD_VERSION=2.4.6
1111
ARG KUSTOMIZE_VERSION=4.5.5
@@ -39,27 +39,32 @@ RUN curl -L https://mirror.openshift.com/pub/openshift-v4/$(if [[ "$TARGETPLATFO
3939

4040
RUN curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi)/kubectl" && \
4141
chmod +x ./kubectl && \
42-
sudo mv ./kubectl /usr/local/bin
42+
sudo mv ./kubectl /usr/local/bin && \
43+
kubectl version --client
4344

4445
RUN curl -sL -o ./yq3 $(curl -sL https://api.github.com/repos/mikefarah/yq/releases/tags/3.4.1 | jq -r --arg NAME "yq_linux_$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi)" '.assets[] | select(.name == $NAME) | .browser_download_url') && \
4546
chmod +x ./yq3 && \
46-
sudo mv ./yq3 /usr/bin/yq3
47+
sudo mv ./yq3 /usr/bin/yq3 && \
48+
yq3 --version
4749

4850
RUN curl -sL -o ./helm.tar.gz https://get.helm.sh/helm-v3.8.2-linux-$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi).tar.gz && \
4951
tar xzf ./helm.tar.gz linux-$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi)/helm && \
5052
sudo mv ./linux-$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi)/helm /usr/bin/helm && \
5153
rmdir ./linux-$(if [[ "$TARGETPLATFORM" == "linux/arm64" ]]; then echo "arm64"; else echo "amd64"; fi) && \
52-
rm ./helm.tar.gz
54+
rm ./helm.tar.gz && \
55+
helm version
5356

5457
## igc
5558
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) && \
5659
chmod +x igc && \
57-
sudo mv igc /usr/local/bin
60+
sudo mv igc /usr/local/bin && \
61+
igc --version
5862

5963
## gitu
6064
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) && \
6165
chmod +x gitu && \
62-
sudo mv gitu /usr/local/bin
66+
sudo mv gitu /usr/local/bin && \
67+
gitu --version
6368

6469
## kubeseal
6570
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 && \
@@ -70,12 +75,14 @@ RUN curl -sLo kubeseal.tar.gz https://github.com/bitnami-labs/sealed-secrets/rel
7075
sudo mv kubeseal /usr/local/bin && \
7176
cd .. && \
7277
rm -rf tmp && \
73-
rm kubeseal.tar.gz
78+
rm kubeseal.tar.gz && \
79+
kubeseal --version
7480

7581
## argocd
7682
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) && \
7783
chmod +x argocd && \
78-
sudo mv argocd /usr/local/bin
84+
sudo mv argocd /usr/local/bin && \
85+
argocd version --client
7986

8087
## kustomize
8188
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 && \
@@ -85,7 +92,8 @@ RUN curl -sLo kustomize.tar.gz https://github.com/kubernetes-sigs/kustomize/rele
8592
sudo mv kustomize /usr/local/bin && \
8693
cd .. && \
8794
rm -rf tmp && \
88-
rm kustomize.tar.gz
95+
rm kustomize.tar.gz && \
96+
kustomize version
8997

9098
VOLUME /workspaces
9199

0 commit comments

Comments
 (0)