From aa0095b09e33c6894aad8e4e5157a06870f5ca5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Henning?= <soeren.henning@email.uni-kiel.de>
Date: Fri, 10 Jun 2022 13:10:19 +0200
Subject: [PATCH] Minor Dockerfile an CI file fixes
---
.gitlab-ci.yml | 3 ++-
buildimages/k3d-helm/Dockerfile | 1 -
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 711445cd9..b096482c6 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 30a1e6b12..496cddd68 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
--
GitLab