diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 711445cd99e41ab2ef18926e8ec3d3c458ba7d80..b096482c6ba0086dddfd22af5c0d40396f223fe3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -898,7 +898,8 @@ deploy-buildimage-k3d-helm: - .kaniko-push needs: [] variables: - BUILD_ARG_DOCKER_VERSION: 20.10.12 + DOCKER_VERSION: 20.10.12 + BUILD_ARG_DOCKER_VERSION: $DOCKER_VERSION BUILD_ARG_KUBECTL: v1.21.3 IMAGE_NAME: theodolite-build-k3d-helm IMAGE_TAG: $DOCKER_VERSION diff --git a/buildimages/k3d-helm/Dockerfile b/buildimages/k3d-helm/Dockerfile index 30a1e6b1231cec157311546b8f7e7b0a091c83fe..496cddd68a230a7ea8b0f73adb9ffa37e35e6719 100644 --- a/buildimages/k3d-helm/Dockerfile +++ b/buildimages/k3d-helm/Dockerfile @@ -8,7 +8,6 @@ RUN apk add -U wget bash openssl # install kubectl RUN wget -q -O /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl && \ chmod +x /usr/local/bin/kubectl -RUN echo https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION} # install k3d RUN wget -q -O - https://raw.githubusercontent.com/rancher/k3d/main/install.sh | bash # install Helm