Merge pull request #134 from kubermatic/containers/update-k1-ui-vnc-c…

…ontainer Update K1 UI tooling container
kubermatic · Nov 14, 2024 · eafa204 · eafa204
2 parents 1750b51 + ed90db0
commit eafa204
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/container/kubeone-tool-container/Dockerfile b/container/kubeone-tool-container/Dockerfile
@@ -23,7 +23,7 @@ ARG ARCH
 ARG OS
 USER 0
 
-ENV GO111MODULE on
+ENV GO111MODULE=on
 # Install KubeOne
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -91,11 +91,12 @@ RUN curl -L $(curl -s https://api.github.com/repos/vmware/govmomi/releases/lates
     chmod +x /usr/local/bin/govc
 
 # Install Kubectl & Helm & and fubectl depedencies
-RUN echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.27/deb/ /" | sudo tee /etc/apt/sources.list.d/kubernetes.list && \
-    mkdir -p /etc/apt/keyrings && curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.27/deb/Release.key | sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg && \
-    #helm
-    curl -s https://baltocdn.com/helm/signing.asc | sudo apt-key add - && \
-    echo "deb https://baltocdn.com/helm/stable/debian/ all main" | tee  -a /etc/apt/sources.list.d/helm-stable-debian.list && \
+RUN echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.30/deb/ /" | sudo tee /etc/apt/sources.list.d/kubernetes.list && \
+    mkdir -p /etc/apt/keyrings && curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.30/deb/Release.key | sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg && \
+    #helm \
+    curl https://baltocdn.com/helm/signing.asc | gpg --dearmor | sudo tee /usr/share/keyrings/helm.gpg > /dev/null && \
+    sudo apt-get install apt-transport-https --yes && \
+    echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/helm.gpg] https://baltocdn.com/helm/stable/debian/ all main" | sudo tee /etc/apt/sources.list.d/helm-stable-debian.list && \
     apt-get update && \
     apt-get install -y kubectl helm jq && \
     apt-get clean

diff --git a/container/kubermatic-dev-ui/Makefile b/container/kubermatic-dev-ui/Makefile
@@ -1,7 +1,7 @@
 ## See https://github.com/kubermatic/kubeone/releases
 UI_VERSION ?= 0.1.1
 
-KUBEONE_VERSION ?= 1.6.0
+KUBEONE_VERSION ?= 1.8.3
 ### TODO transfer to kubermatic repo
 DOCKER_REPO ?= 'quay.io/toschneck/kubermatic-dev-ui'
 FINAL_TAG ?= ${UI_VERSION}
@@ -27,9 +27,9 @@ docker-run-local-root: docker-build
 	docker run -it --user 0 --rm -p 6901:6901 -p 5901:5901 -v $(shell pwd):/headless/mnt ${DOCKER_REPO}:${TAG_DATE} bash
 
 docker-run:
-	docker run -it -v $(shell pwd):/headless/mnt ${DOCKER_REPO}:${UI_VERSION} bash
+	docker run -it --rm -p 6901:6901 -p 5901:5901 -v $(shell pwd):/headless/mnt ${DOCKER_REPO}:latest bash
 docker-run-root:
-	docker run -it --user 0 -v $(shell pwd):/headless/mnt ${DOCKER_REPO}:${UI_VERSION} bash
+	docker run -it --user 0 --rm -p 6901:6901 -p 5901:5901 -v $(shell pwd):/headless/mnt ${DOCKER_REPO}:${UI_VERSION} bash
 
 # update latest, version ref and set unique tag
 docker-release: docker-build