Skip to content

Commit

Permalink
2020-07-12_01 (#26)
Browse files Browse the repository at this point in the history
* updated all versions, added terraform3

* released 2020-07-12_01
  • Loading branch information
ksandermann authored Jul 12, 2020
1 parent 72c0f99 commit 9f6cafc
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 9 deletions.
14 changes: 11 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@ ARG KUBECTL_VERSION="1.18.5"
ARG HELM_VERSION="2.16.9"
ARG HELM3_VERSION="3.2.4"
ARG TERRAFORM_VERSION="0.12.28"
ARG AWS_CLI_VERSION="1.18.93"
ARG TERRAFORM13_VERSION="0.13.0-beta3"
ARG AWS_CLI_VERSION="1.18.97"
ARG AZ_CLI_VERSION="2.8.0-1~bionic"
ARG KOPS_VERSION="1.17.0"
ARG KOPS_VERSION="1.17.1"
ARG ANSIBLE_VERSION="2.9.10"
ARG JINJA_VERSION="2.11.2"
ARG OPENSSH_VERSION="8.3p1"
ARG GCLOUD_VERSION="299.0.0-0"
ARG GCLOUD_VERSION="300.0.0-0"

ARG ZSH_VERSION="5.4.2-3ubuntu3.1"
ARG MULTISTAGE_BUILDER_VERSION="2020-06-19"
Expand All @@ -29,6 +30,7 @@ ARG OC_CLI_SOURCE
ARG HELM_VERSION
ARG HELM3_VERSION
ARG TERRAFORM_VERSION
ARG TERRAFORM13_VERSION
ARG DOCKER_VERSION
ARG KUBECTL_VERSION
ARG KOPS_VERSION
Expand All @@ -52,6 +54,10 @@ WORKDIR /root/download
RUN wget https://releases.hashicorp.com/terraform/$TERRAFORM_VERSION/terraform\_$TERRAFORM_VERSION\_linux_amd64.zip && \
unzip ./terraform\_$TERRAFORM_VERSION\_linux_amd64.zip -d terraform_cli

#download terraform
RUN wget https://releases.hashicorp.com/terraform/${TERRAFORM13_VERSION}/terraform\_${TERRAFORM13_VERSION}\_linux_amd64.zip && \
unzip ./terraform\_${TERRAFORM13_VERSION}\_linux_amd64.zip -d terraform13_cli

#download docker
#credits to https://github.com/docker-library/docker/blob/463595652d2367887b1ffe95ec30caa00179be72/18.09/Dockerfile
RUN mkdir -p /root/download/docker/bin && \
Expand Down Expand Up @@ -214,6 +220,7 @@ COPY --from=builder "/root/download/helm2/linux-amd64/helm" "/usr/local/bin/helm
COPY --from=builder "/root/download/helm3/linux-amd64/helm" "/usr/local/bin/helm3"
COPY --from=builder "/root/download/oc_cli/oc" "/usr/local/bin/oc"
COPY --from=builder "/root/download/terraform_cli/terraform" "/usr/local/bin/terraform"
COPY --from=builder "/root/download/terraform13_cli/terraform" "/usr/local/bin/terraform13"
COPY --from=builder "/root/download/docker/bin/*" "/usr/local/bin/"
COPY --from=builder "/root/download/kubectl" "/usr/local/bin/kubectl"
COPY --from=builder "/root/download/kops" "/usr/local/bin/kops"
Expand All @@ -224,6 +231,7 @@ RUN chmod -R +x /usr/local/bin && \
helm3 version && \
kubectl version --client=true && \
terraform version && \
terraform13 version && \
docker --version && \
kops version && \
yq --version && \
Expand Down
20 changes: 15 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@ The behaviour of run.sh is as follows:
# custom ca certificates`
All CAs placed inside ```~/ca-certificates``` on the host system will be mounted into the container and trusted on startup.

# helm 2 and helm 3
While a lot of projects/customers are upgrading to helm 3, helm 2 will probably still be around for some time.
# helm 3 and terraform 0.13
While a lot of projects are upgrading to helm 3, helm 2 will probably still be around for some time.
As helm 3 does not provide backward-compatibility, both versions are installed in parallel in cloud-toolbox.
Helm 2 can be used as before to provide backward-compatibility, helm 3 can be used via binary `helm3`.
Helm 2 can be used as before to provide backward-compatibility, helm 3 can be used via binary `helm3`.
The same pattern applies to terraform 0.12 and 0.13 - 0.12 can be used via binary `terraform`, while 0.13 is available via binary `terraform13`.

# versioning
Release tags will be build following pattern YYYY-MM-dd-version.
Expand All @@ -30,8 +31,17 @@ Other versions of a date can contain version combinations of the toolchain and w
below.

## version history
latest -> 2020-07-04_01
project -> 2020-07-04_02
latest -> 2020-07-12_01
project -> 2020-07-12_02

v0.13.0-beta3

| RELEASE | UBUNTU | DOCKER | KUBECTL | OC CLI | HELM | HELM3 | TERRAFORM | TERRAFORM13 | AWS CLI | AZ CLI | GCLOUD SDK | KOPS | ANSIBLE | JINJA2 | OPENSSH |
|---------------|--------|----------|----------|--------|--------|---------|-----------|---------------|----------|--------|------------|--------|---------|--------|---------|
| 2020-07-12_01 | 18.04 | 19.03.11 | 1.18.5 | 3.11 | 2.16.9 | 3.2.4 | 0.12.28 | 0.13.0-beta3 | 1.18.97 | 2.8.0 | 300.0.0 | 1.17.1 | 2.9.10 | 2.11.2 | 8.3p1 |
| 2020-07-12_02 | 18.04 | 19.03.11 | 1.16.12 | 3.11 | 2.16.1 | 3.2.4 | 0.12.28 | 0.13.0-beta3 | 1.18.97 | 2.8.0 | 300.0.0 | 1.17.1 | 2.9.10 | 2.11.2 | 8.3p1 |

## version history before 2020-07-12

| RELEASE | UBUNTU | DOCKER | KUBECTL | OC CLI | HELM | HELM3 | TERRAFORM | AWS CLI | AZ CLI | GCLOUD SDK | KOPS | ANSIBLE | JINJA2 | OPENSSH |
|---------------|--------|----------|----------|--------|--------|---------|-----------|----------|--------|------------|--------|---------|--------|---------|
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -euo pipefail
IFS=$'\n\t'

IMAGE_TAG="2020-07-04_01"
IMAGE_TAG="2020-07-12_01"
UPSTREAM_TAG="latest"

docker build \
Expand Down

0 comments on commit 9f6cafc

Please sign in to comment.