Skip to content

Commit a69a08d

Browse files
committed
ci(k3d): update k3d to latest and remove runc install in circleci
A long time has passed and the reason for this was: k3d-io/k3d#807 We should be able to use the builtin runc instead Signed-off-by: Charly Molter <[email protected]>
1 parent b26da2a commit a69a08d

File tree

3 files changed

+2
-10
lines changed

3 files changed

+2
-10
lines changed

.circleci/config.yml

-8
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,6 @@ commands:
5454
# if GOPATH is not set, `golang-ci` fails with an obscure message
5555
# "ERRO Running error: context loading failed: failed to load program with go/packages: could not determine GOARCH and Go compiler"
5656
echo 'export GOPATH=$HOME/go' >> $BASH_ENV
57-
- run:
58-
name: "Update runc"
59-
# See https://github.com/rancher/k3d/issues/807 (runc's default version on the instance fails k3d)
60-
command: |
61-
if [[ `uname -s` == "Linux" ]]; then
62-
sudo sh -c 'curl -s --fail --location https://github.com/opencontainers/runc/releases/download/v1.1.0/runc.<<parameters.go_arch>> > /usr/bin/runc'
63-
sudo chown root:root /usr/bin/runc ; sudo chmod o+x /usr/bin/runc
64-
fi
6557
skip_on_branch:
6658
description: "Skip the job on the branch"
6759
steps:

mk/dependencies/deps.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
e96ce3bb7caa3ae15cd5f5d75feb25e8bc562ead
1+
db2d98b7beb0286eef1edb7b371ce0c635b01211

mk/dependencies/k3d.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set -e
44

55
OUTPUT_DIR=$1/bin
6-
VERSION="5.4.1"
6+
VERSION="5.4.7"
77
# see https://raw.githubusercontent.com/rancher/k3d/main/install.sh
88
curl --fail --location -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | \
99
PATH=${OUTPUT_DIR}:${PATH} TAG=v${VERSION} USE_SUDO="false" K3D_INSTALL_DIR="${OUTPUT_DIR}" bash

0 commit comments

Comments
 (0)