beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

contrib/busybox: Update to FRP-5007-g82accfc19

Browse source 
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
This commit is contained in:
Paweł Gronowski 2023-06-21 14:15:05 +02:00
parent 404160ad87
commit e010223186
No known key found for this signature in database
GPG key ID: B85EFCFE26DEF92A
2 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
contrib/busybox/Dockerfile
View file

@ -10,10 +10,10 @@
# To publish: Needs someone with publishing rights # To publish: Needs someone with publishing rights
ARG WINDOWS_BASE_IMAGE=mcr.microsoft.com/windows/servercore ARG WINDOWS_BASE_IMAGE=mcr.microsoft.com/windows/servercore
ARG WINDOWS_BASE_IMAGE_TAG=ltsc2022 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 # 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} FROM ${WINDOWS_BASE_IMAGE}:${WINDOWS_BASE_IMAGE_TAG}
RUN mkdir C:\tmp && mkdir C:\bin RUN mkdir C:\tmp && mkdir C:\bin

11
integration-cli/docker_api_build_test.go
View file

@ -24,17 +24,10 @@ import (
func (s *DockerAPISuite) TestBuildAPIDockerFileRemote(c *testing.T) { func (s *DockerAPISuite) TestBuildAPIDockerFileRemote(c *testing.T) {
testRequires(c, NotUserNamespace) testRequires(c, NotUserNamespace)
var testD string // -xdev is required because sysfs can cause EPERM
if testEnv.OSType == "windows" { testD := `FROM busybox
testD = `FROM busybox
RUN find / -name ba*
RUN find /tmp/`
} else {
// -xdev is required because sysfs can cause EPERM
testD = `FROM busybox
RUN find / -xdev -name ba* RUN find / -xdev -name ba*
RUN find /tmp/` RUN find /tmp/`
}
server := fakestorage.New(c, "", fakecontext.WithFiles(map[string]string{"testD": testD})) server := fakestorage.New(c, "", fakecontext.WithFiles(map[string]string{"testD": testD}))
defer server.Close() defer server.Close()