From e01022318621102f6692ddc37a5b0c475dfe5ab4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Wed, 21 Jun 2023 14:15:05 +0200 Subject: [PATCH] contrib/busybox: Update to FRP-5007-g82accfc19 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Paweł Gronowski --- contrib/busybox/Dockerfile | 4 ++-- integration-cli/docker_api_build_test.go | 11 ++--------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/contrib/busybox/Dockerfile b/contrib/busybox/Dockerfile index 51a27e0b73..ad3068428d 100644 --- a/contrib/busybox/Dockerfile +++ b/contrib/busybox/Dockerfile @@ -10,10 +10,10 @@ # To publish: Needs someone with publishing rights ARG WINDOWS_BASE_IMAGE=mcr.microsoft.com/windows/servercore ARG WINDOWS_BASE_IMAGE_TAG=ltsc2022 -ARG BUSYBOX_VERSION=FRP-3329-gcf0fa4d13 +ARG BUSYBOX_VERSION=FRP-5007-g82accfc19 # Checksum taken from https://frippery.org/files/busybox/SHA256SUM -ARG BUSYBOX_SHA256SUM=bfaeb88638e580fc522a68e69072e305308f9747563e51fa085eec60ca39a5ae +ARG BUSYBOX_SHA256SUM=2d6fff0b2de5c034c92990d696c0d85a677b8a75931fa1ec30694fbf1f1df5c9 FROM ${WINDOWS_BASE_IMAGE}:${WINDOWS_BASE_IMAGE_TAG} RUN mkdir C:\tmp && mkdir C:\bin diff --git a/integration-cli/docker_api_build_test.go b/integration-cli/docker_api_build_test.go index 4b1008ec87..2bc9c9dd98 100644 --- a/integration-cli/docker_api_build_test.go +++ b/integration-cli/docker_api_build_test.go @@ -24,17 +24,10 @@ import ( func (s *DockerAPISuite) TestBuildAPIDockerFileRemote(c *testing.T) { testRequires(c, NotUserNamespace) - var testD string - if testEnv.OSType == "windows" { - testD = `FROM busybox -RUN find / -name ba* -RUN find /tmp/` - } else { - // -xdev is required because sysfs can cause EPERM - testD = `FROM busybox + // -xdev is required because sysfs can cause EPERM + testD := `FROM busybox RUN find / -xdev -name ba* RUN find /tmp/` - } server := fakestorage.New(c, "", fakecontext.WithFiles(map[string]string{"testD": testD})) defer server.Close()