Skip to content

Commit

Permalink
ci(k3d): update k3d to latest and remove runc install in circleci
Browse files Browse the repository at this point in the history
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 <charly.molter@konghq.com>
  • Loading branch information
lahabana committed Feb 8, 2023
1 parent b26da2a commit a69a08d
Showing 3 changed files with 2 additions and 10 deletions.
8 changes: 0 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -54,14 +54,6 @@ commands:
# if GOPATH is not set, `golang-ci` fails with an obscure message
# "ERRO Running error: context loading failed: failed to load program with go/packages: could not determine GOARCH and Go compiler"
echo 'export GOPATH=$HOME/go' >> $BASH_ENV
- run:
name: "Update runc"
# See https://github.com/rancher/k3d/issues/807 (runc's default version on the instance fails k3d)
command: |
if [[ `uname -s` == "Linux" ]]; then
sudo sh -c 'curl -s --fail --location https://github.com/opencontainers/runc/releases/download/v1.1.0/runc.<<parameters.go_arch>> > /usr/bin/runc'
sudo chown root:root /usr/bin/runc ; sudo chmod o+x /usr/bin/runc
fi
skip_on_branch:
description: "Skip the job on the branch"
steps:
2 changes: 1 addition & 1 deletion mk/dependencies/deps.lock
Original file line number Diff line number Diff line change
@@ -1 +1 @@
e96ce3bb7caa3ae15cd5f5d75feb25e8bc562ead
db2d98b7beb0286eef1edb7b371ce0c635b01211
2 changes: 1 addition & 1 deletion mk/dependencies/k3d.sh
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
set -e

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

0 comments on commit a69a08d

Please sign in to comment.