From 87c8338aba7eac1f1b9944b943cc365b28621790 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Thu, 6 Mar 2025 12:50:32 +0000 Subject: [PATCH] fix(dockerutil): correct usrLibMultiarchDir --- dockerutil/image.go | 3 ++- dockerutil/image_linux_amd64.go | 2 +- dockerutil/image_linux_arm64.go | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dockerutil/image.go b/dockerutil/image.go index a5323f2..f49cba0 100644 --- a/dockerutil/image.go +++ b/dockerutil/image.go @@ -9,13 +9,14 @@ import ( "strings" "time" - "cdr.dev/slog" dockertypes "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/image" "golang.org/x/xerrors" + "cdr.dev/slog" + "github.com/coder/envbox/buildlog" "github.com/coder/envbox/xunix" "github.com/coder/retry" diff --git a/dockerutil/image_linux_amd64.go b/dockerutil/image_linux_amd64.go index 577c1be..5952a29 100644 --- a/dockerutil/image_linux_amd64.go +++ b/dockerutil/image_linux_amd64.go @@ -2,4 +2,4 @@ package dockerutil // usrLibMultiarchDir is defined for arm64 and amd64 architectures. // Envbox is not published for other architectures. -var usrLibMultiarchDir = "/usr/lib/aarch64-linux-gnu" +var usrLibMultiarchDir = "/usr/lib/x86_64-linux-gnu" diff --git a/dockerutil/image_linux_arm64.go b/dockerutil/image_linux_arm64.go index 5952a29..577c1be 100644 --- a/dockerutil/image_linux_arm64.go +++ b/dockerutil/image_linux_arm64.go @@ -2,4 +2,4 @@ package dockerutil // usrLibMultiarchDir is defined for arm64 and amd64 architectures. // Envbox is not published for other architectures. -var usrLibMultiarchDir = "/usr/lib/x86_64-linux-gnu" +var usrLibMultiarchDir = "/usr/lib/aarch64-linux-gnu"