Skip to content

Commit f6570e4

Browse files
authored
Merge pull request #36 from kbst/fixgithuberrorpage
Update Dockerfile dependencies and ensure working binaries
2 parents c2322ab + 7bdc38e commit f6570e4

File tree

1 file changed

+18
-11
lines changed

1 file changed

+18
-11
lines changed

quickstart/src/ci-cd/Dockerfile

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,41 +12,47 @@ RUN apt-get update && apt-get install -y \
1212
RUN mkdir -p /opt/bin
1313

1414
# Default versions
15-
ARG KUBECTL_VERSION=v1.13.2
16-
ARG KUSTOMIZE_VERSION=2.0.1
17-
ARG TERRAFORM_VERSION=0.11.11
15+
ARG KUBECTL_VERSION=v1.14.0
16+
ARG KUSTOMIZE_VERSION=2.0.3
17+
ARG TERRAFORM_VERSION=0.11.13
1818
ARG AWS_IAM_AUTHENTICATOR_VERSION=0.3.0
19-
ARG GOOGLE_CLOUD_SDK_VERSION=232.0.0
19+
ARG GOOGLE_CLOUD_SDK_VERSION=239.0.0
2020

2121
# Common dependencies
2222
RUN echo "KUBECTL_VERSION: ${KUBECTL_VERSION}" \
2323
&& curl -Lo /opt/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl \
24-
&& chmod +x /opt/bin/kubectl
24+
&& chmod +x /opt/bin/kubectl \
25+
&& /opt/bin/kubectl version --client=true
2526

2627
RUN echo "KUSTOMIZE_VERSION: ${KUSTOMIZE_VERSION}" \
2728
&& curl -Lo /opt/bin/kustomize https://github.com/kubernetes-sigs/kustomize/releases/download/v${KUSTOMIZE_VERSION}/kustomize_${KUSTOMIZE_VERSION}_linux_amd64 \
28-
&& chmod +x /opt/bin/kustomize
29+
&& chmod +x /opt/bin/kustomize \
30+
&& /opt/bin/kustomize version
2931

3032
RUN echo "TERRAFORM_VERSION: ${TERRAFORM_VERSION}" \
3133
&& curl -LO https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip \
3234
&& unzip terraform_${TERRAFORM_VERSION}_linux_amd64.zip -d /opt/bin \
33-
&& chmod +x /opt/bin/terraform
35+
&& chmod +x /opt/bin/terraform \
36+
&& /opt/bin/terraform version
3437

3538
# AWS specific dependencies
3639
RUN echo "AWS_IAM_AUTHENTICATOR_VERSION: ${AWS_IAM_AUTHENTICATOR_VERSION}" \
3740
&& curl -Lo /opt/bin/aws-iam-authenticator https://github.com/kubernetes-sigs/aws-iam-authenticator/releases/download/v${AWS_IAM_AUTHENTICATOR_VERSION}/heptio-authenticator-aws_${AWS_IAM_AUTHENTICATOR_VERSION}_linux_amd64 \
38-
&& chmod +x /opt/bin/aws-iam-authenticator
41+
&& chmod +x /opt/bin/aws-iam-authenticator \
42+
&& /opt/bin/aws-iam-authenticator
3943

4044
RUN echo "AWS_CLI_VERSION: N/A" \
4145
&& curl "https://s3.amazonaws.com/aws-cli/awscli-bundle.zip" -o "awscli-bundle.zip" \
4246
&& unzip awscli-bundle.zip \
43-
&& ./awscli-bundle/install -i /opt/aws -b /opt/bin/aws
47+
&& ./awscli-bundle/install -i /opt/aws -b /opt/bin/aws \
48+
&& /opt/bin/aws --version
4449

4550
# Google specific dependencies
4651
RUN echo "GOOGLE_CLOUD_SDK_VERSION: ${GOOGLE_CLOUD_SDK_VERSION}" \
4752
&& curl -O https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-${GOOGLE_CLOUD_SDK_VERSION}-linux-x86_64.tar.gz \
4853
&& tar zxvf google-cloud-sdk-${GOOGLE_CLOUD_SDK_VERSION}-linux-x86_64.tar.gz google-cloud-sdk \
49-
&& mv google-cloud-sdk /opt/google-cloud-sdk
54+
&& mv google-cloud-sdk /opt/google-cloud-sdk \
55+
/opt/google-cloud-sdk/bin/gcloud --version
5056

5157
# Azure specific dependencies
5258
RUN virtualenv /opt/azure/ \
@@ -56,7 +62,8 @@ RUN virtualenv /opt/azure/ \
5662
azure-mgmt-nspkg \
5763
&& echo '#!/usr/bin/env bash\n/opt/azure/bin/python -m azure.cli "$@"' \
5864
> /opt/bin/az \
59-
&& chmod +x /opt/bin/az
65+
&& chmod +x /opt/bin/az \
66+
&& /opt/bin/az --version
6067

6168
COPY nss-wrapper /opt/bin/nss-wrapper
6269

0 commit comments

Comments
 (0)