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

frozen images: update to debian:bookworm-slim

Browse source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2023-06-22 16:04:26 +02:00
parent fd40dfaf58
commit 3bfb6a9420
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
11 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -130,7 +130,7 @@ ARG TARGETVARIANT
RUN /download-frozen-image-v2.sh /build \ RUN /download-frozen-image-v2.sh /build \
busybox:latest@sha256:95cf004f559831017cdf4628aaf1bb30133677be8702a8c5f2994629f637a209 \ busybox:latest@sha256:95cf004f559831017cdf4628aaf1bb30133677be8702a8c5f2994629f637a209 \
busybox:glibc@sha256:1f81263701cddf6402afe9f33fca0266d9fff379e59b1748f33d3072da71ee85 \ busybox:glibc@sha256:1f81263701cddf6402afe9f33fca0266d9fff379e59b1748f33d3072da71ee85 \
debian:bullseye-slim@sha256:dacf278785a4daa9de07596ec739dbc07131e189942772210709c5c0777e8437 \ debian:bookworm-slim@sha256:2bc5c236e9b262645a323e9088dfa3bb1ecb16cc75811daf40a23a824d665be9 \
hello-world:latest@sha256:d58e752213a51785838f9eed2b7a498ffa1cb3aa7f946dda11af39286c3db9a9 \ hello-world:latest@sha256:d58e752213a51785838f9eed2b7a498ffa1cb3aa7f946dda11af39286c3db9a9 \
arm32v7/hello-world:latest@sha256:50b8560ad574c779908da71f7ce370c0a2471c098d44d1c8f6b513c5a55eeeb1 arm32v7/hello-world:latest@sha256:50b8560ad574c779908da71f7ce370c0a2471c098d44d1c8f6b513c5a55eeeb1

2
cli/winresources/README.md
View file

@ -1,7 +1,7 @@
## Generate `event_messages.bin` ## Generate `event_messages.bin`
```console ```console
$ docker run --rm -it -v "$(pwd):/winresources" debian:bullseye bash $ docker run --rm -it -v "$(pwd):/winresources" debian:bookworm-slim bash
root@9ad2260f6ebc:/# apt-get update -y && apt-get install -y binutils-mingw-w64-x86-64 root@9ad2260f6ebc:/# apt-get update -y && apt-get install -y binutils-mingw-w64-x86-64
root@9ad2260f6ebc:/# x86_64-w64-mingw32-windmc -v /winresources/event_messages.mc root@9ad2260f6ebc:/# x86_64-w64-mingw32-windmc -v /winresources/event_messages.mc
root@9ad2260f6ebc:/# mv MSG00001.bin /winresources/event_messages.bin root@9ad2260f6ebc:/# mv MSG00001.bin /winresources/event_messages.bin

2
contrib/nnp-test/Dockerfile
View file

@ -1,4 +1,4 @@
FROM debian:bullseye-slim FROM debian:bookworm-slim
RUN apt-get update && apt-get install -y gcc libc6-dev --no-install-recommends RUN apt-get update && apt-get install -y gcc libc6-dev --no-install-recommends
COPY . /usr/src/ COPY . /usr/src/

2
contrib/syscall-test/Dockerfile
View file

@ -1,4 +1,4 @@
FROM debian:bullseye-slim FROM debian:bookworm-slim
RUN apt-get update && apt-get install -y gcc libc6-dev --no-install-recommends RUN apt-get update && apt-get install -y gcc libc6-dev --no-install-recommends
COPY . /usr/src/ COPY . /usr/src/

2
integration-cli/docker_cli_daemon_test.go
View file

@ -1674,7 +1674,7 @@ func (s *DockerDaemonSuite) TestDaemonNoSpaceLeftOnDeviceError(c *testing.T) {
defer s.d.Stop(c) defer s.d.Stop(c)
// pull a repository large enough to overfill the mounted filesystem // pull a repository large enough to overfill the mounted filesystem
pullOut, err := s.d.Cmd("pull", "debian:bullseye-slim") pullOut, err := s.d.Cmd("pull", "debian:bookworm-slim")
assert.Check(c, err != nil) assert.Check(c, err != nil)
assert.Check(c, is.Contains(pullOut, "no space left on device")) assert.Check(c, is.Contains(pullOut, "no space left on device"))
} }

2
integration-cli/docker_cli_network_unix_test.go
View file

@ -1580,7 +1580,7 @@ func (s *DockerCLINetworkSuite) TestEmbeddedDNSInvalidInput(c *testing.T) {
cli.DockerCmd(c, "network", "create", "-d", "bridge", "nw1") cli.DockerCmd(c, "network", "create", "-d", "bridge", "nw1")
// Sending garbage to embedded DNS shouldn't crash the daemon // Sending garbage to embedded DNS shouldn't crash the daemon
cli.DockerCmd(c, "run", "-i", "--net=nw1", "--name=c1", "debian:bullseye-slim", "bash", "-c", "echo InvalidQuery > /dev/udp/127.0.0.11/53") cli.DockerCmd(c, "run", "-i", "--net=nw1", "--name=c1", "debian:bookworm-slim", "bash", "-c", "echo InvalidQuery > /dev/udp/127.0.0.11/53")
} }
func (s *DockerCLINetworkSuite) TestDockerNetworkConnectFailsNoInspectChange(c *testing.T) { func (s *DockerCLINetworkSuite) TestDockerNetworkConnectFailsNoInspectChange(c *testing.T) {

6
integration-cli/docker_cli_run_test.go
View file

@ -2895,7 +2895,7 @@ func (s *DockerCLIRunSuite) TestRunUnshareProc(c *testing.T) {
go func() { go func() {
name := "acidburn" name := "acidburn"
out, _, err := dockerCmdWithError("run", "--name", name, "--security-opt", "seccomp=unconfined", "debian:bullseye-slim", "unshare", "-p", "-m", "-f", "-r", "--mount-proc=/proc", "mount") out, _, err := dockerCmdWithError("run", "--name", name, "--security-opt", "seccomp=unconfined", "debian:bookworm-slim", "unshare", "-p", "-m", "-f", "-r", "--mount-proc=/proc", "mount")
if err == nil || if err == nil ||
!(strings.Contains(strings.ToLower(out), "permission denied") || !(strings.Contains(strings.ToLower(out), "permission denied") ||
strings.Contains(strings.ToLower(out), "operation not permitted")) { strings.Contains(strings.ToLower(out), "operation not permitted")) {
@ -2907,7 +2907,7 @@ func (s *DockerCLIRunSuite) TestRunUnshareProc(c *testing.T) {
go func() { go func() {
name := "cereal" name := "cereal"
out, _, err := dockerCmdWithError("run", "--name", name, "--security-opt", "seccomp=unconfined", "debian:bullseye-slim", "unshare", "-p", "-m", "-f", "-r", "mount", "-t", "proc", "none", "/proc") out, _, err := dockerCmdWithError("run", "--name", name, "--security-opt", "seccomp=unconfined", "debian:bookworm-slim", "unshare", "-p", "-m", "-f", "-r", "mount", "-t", "proc", "none", "/proc")
if err == nil || if err == nil ||
!(strings.Contains(strings.ToLower(out), "mount: cannot mount none") || !(strings.Contains(strings.ToLower(out), "mount: cannot mount none") ||
strings.Contains(strings.ToLower(out), "permission denied") || strings.Contains(strings.ToLower(out), "permission denied") ||
@ -2921,7 +2921,7 @@ func (s *DockerCLIRunSuite) TestRunUnshareProc(c *testing.T) {
/* Ensure still fails if running privileged with the default policy */ /* Ensure still fails if running privileged with the default policy */
go func() { go func() {
name := "crashoverride" name := "crashoverride"
out, _, err := dockerCmdWithError("run", "--privileged", "--security-opt", "seccomp=unconfined", "--security-opt", "apparmor=docker-default", "--name", name, "debian:bullseye-slim", "unshare", "-p", "-m", "-f", "-r", "mount", "-t", "proc", "none", "/proc") out, _, err := dockerCmdWithError("run", "--privileged", "--security-opt", "seccomp=unconfined", "--security-opt", "apparmor=docker-default", "--name", name, "debian:bookworm-slim", "unshare", "-p", "-m", "-f", "-r", "mount", "-t", "proc", "none", "/proc")
if err == nil || if err == nil ||
!(strings.Contains(strings.ToLower(out), "mount: cannot mount none") || !(strings.Contains(strings.ToLower(out), "mount: cannot mount none") ||
strings.Contains(strings.ToLower(out), "permission denied") || strings.Contains(strings.ToLower(out), "permission denied") ||

18
integration-cli/docker_cli_run_unix_test.go
View file

@ -846,12 +846,12 @@ func (s *DockerCLIRunSuite) TestRunTmpfsMountsWithOptions(c *testing.T) {
assert.Assert(c, strings.Contains(out, option)) assert.Assert(c, strings.Contains(out, option))
} }
// We use debian:bullseye-slim as there is no findmnt in busybox. Also the output will be in the format of // We use debian:bookworm-slim as there is no findmnt in busybox. Also the output will be in the format of
// TARGET PROPAGATION // TARGET PROPAGATION
// /tmp shared // /tmp shared
// so we only capture `shared` here. // so we only capture `shared` here.
expectedOptions = []string{"shared"} expectedOptions = []string{"shared"}
out = cli.DockerCmd(c, "run", "--tmpfs", "/tmp:shared", "debian:bullseye-slim", "findmnt", "-o", "TARGET,PROPAGATION", "/tmp").Combined() out = cli.DockerCmd(c, "run", "--tmpfs", "/tmp:shared", "debian:bookworm-slim", "findmnt", "-o", "TARGET,PROPAGATION", "/tmp").Combined()
for _, option := range expectedOptions { for _, option := range expectedOptions {
assert.Assert(c, strings.Contains(out, option)) assert.Assert(c, strings.Contains(out, option))
} }
@ -887,7 +887,7 @@ func (s *DockerCLIRunSuite) TestRunSysctls(c *testing.T) {
}) })
} }
// TestRunSeccompProfileDenyUnshare checks that 'docker run --security-opt seccomp=/tmp/profile.json debian:bullseye-slim unshare' exits with operation not permitted. // TestRunSeccompProfileDenyUnshare checks that 'docker run --security-opt seccomp=/tmp/profile.json debian:bookworm-slim unshare' exits with operation not permitted.
func (s *DockerCLIRunSuite) TestRunSeccompProfileDenyUnshare(c *testing.T) { func (s *DockerCLIRunSuite) TestRunSeccompProfileDenyUnshare(c *testing.T) {
testRequires(c, testEnv.IsLocalDaemon, seccompEnabled, Apparmor) testRequires(c, testEnv.IsLocalDaemon, seccompEnabled, Apparmor)
const jsonData = `{ const jsonData = `{
@ -910,7 +910,7 @@ func (s *DockerCLIRunSuite) TestRunSeccompProfileDenyUnshare(c *testing.T) {
} }
icmd.RunCommand(dockerBinary, "run", "--security-opt", "apparmor=unconfined", icmd.RunCommand(dockerBinary, "run", "--security-opt", "apparmor=unconfined",
"--security-opt", "seccomp="+tmpFile.Name(), "--security-opt", "seccomp="+tmpFile.Name(),
"debian:bullseye-slim", "unshare", "-p", "-m", "-f", "-r", "mount", "-t", "proc", "none", "/proc").Assert(c, icmd.Expected{ "debian:bookworm-slim", "unshare", "-p", "-m", "-f", "-r", "mount", "-t", "proc", "none", "/proc").Assert(c, icmd.Expected{
ExitCode: 1, ExitCode: 1,
Err: "Operation not permitted", Err: "Operation not permitted",
}) })
@ -950,7 +950,7 @@ func (s *DockerCLIRunSuite) TestRunSeccompProfileDenyChmod(c *testing.T) {
}) })
} }
// TestRunSeccompProfileDenyUnshareUserns checks that 'docker run debian:bullseye-slim unshare --map-root-user --user sh -c whoami' with a specific profile to // TestRunSeccompProfileDenyUnshareUserns checks that 'docker run debian:bookworm-slim unshare --map-root-user --user sh -c whoami' with a specific profile to
// deny unshare of a userns exits with operation not permitted. // deny unshare of a userns exits with operation not permitted.
func (s *DockerCLIRunSuite) TestRunSeccompProfileDenyUnshareUserns(c *testing.T) { func (s *DockerCLIRunSuite) TestRunSeccompProfileDenyUnshareUserns(c *testing.T) {
testRequires(c, testEnv.IsLocalDaemon, seccompEnabled, Apparmor) testRequires(c, testEnv.IsLocalDaemon, seccompEnabled, Apparmor)
@ -982,7 +982,7 @@ func (s *DockerCLIRunSuite) TestRunSeccompProfileDenyUnshareUserns(c *testing.T)
} }
icmd.RunCommand(dockerBinary, "run", icmd.RunCommand(dockerBinary, "run",
"--security-opt", "apparmor=unconfined", "--security-opt", "seccomp="+tmpFile.Name(), "--security-opt", "apparmor=unconfined", "--security-opt", "seccomp="+tmpFile.Name(),
"debian:bullseye-slim", "unshare", "--map-root-user", "--user", "sh", "-c", "whoami").Assert(c, icmd.Expected{ "debian:bookworm-slim", "unshare", "--map-root-user", "--user", "sh", "-c", "whoami").Assert(c, icmd.Expected{
ExitCode: 1, ExitCode: 1,
Err: "Operation not permitted", Err: "Operation not permitted",
}) })
@ -1034,12 +1034,12 @@ func (s *DockerCLIRunSuite) TestRunSeccompProfileAllow32Bit(c *testing.T) {
icmd.RunCommand(dockerBinary, "run", "syscall-test", "exit32-test").Assert(c, icmd.Success) icmd.RunCommand(dockerBinary, "run", "syscall-test", "exit32-test").Assert(c, icmd.Success)
} }
// TestRunSeccompAllowSetrlimit checks that 'docker run debian:bullseye-slim ulimit -v 1048510' succeeds. // TestRunSeccompAllowSetrlimit checks that 'docker run debian:bookworm-slim ulimit -v 1048510' succeeds.
func (s *DockerCLIRunSuite) TestRunSeccompAllowSetrlimit(c *testing.T) { func (s *DockerCLIRunSuite) TestRunSeccompAllowSetrlimit(c *testing.T) {
testRequires(c, testEnv.IsLocalDaemon, seccompEnabled) testRequires(c, testEnv.IsLocalDaemon, seccompEnabled)
// ulimit uses setrlimit, so we want to make sure we don't break it // ulimit uses setrlimit, so we want to make sure we don't break it
icmd.RunCommand(dockerBinary, "run", "debian:bullseye-slim", "bash", "-c", "ulimit -v 1048510").Assert(c, icmd.Success) icmd.RunCommand(dockerBinary, "run", "debian:bookworm-slim", "bash", "-c", "ulimit -v 1048510").Assert(c, icmd.Success)
} }
func (s *DockerCLIRunSuite) TestRunSeccompDefaultProfileAcct(c *testing.T) { func (s *DockerCLIRunSuite) TestRunSeccompDefaultProfileAcct(c *testing.T) {
@ -1335,7 +1335,7 @@ func (s *DockerCLIRunSuite) TestRunApparmorProcDirectory(c *testing.T) {
func (s *DockerCLIRunSuite) TestRunSeccompWithDefaultProfile(c *testing.T) { func (s *DockerCLIRunSuite) TestRunSeccompWithDefaultProfile(c *testing.T) {
testRequires(c, testEnv.IsLocalDaemon, seccompEnabled) testRequires(c, testEnv.IsLocalDaemon, seccompEnabled)
out, _, err := dockerCmdWithError("run", "--security-opt", "seccomp=../profiles/seccomp/default.json", "debian:bullseye-slim", "unshare", "--map-root-user", "--user", "sh", "-c", "whoami") out, _, err := dockerCmdWithError("run", "--security-opt", "seccomp=../profiles/seccomp/default.json", "debian:bookworm-slim", "unshare", "--map-root-user", "--user", "sh", "-c", "whoami")
assert.ErrorContains(c, err, "", out) assert.ErrorContains(c, err, "", out)
assert.Equal(c, strings.TrimSpace(out), "unshare: unshare failed: Operation not permitted") assert.Equal(c, strings.TrimSpace(out), "unshare: unshare failed: Operation not permitted")
} }

8
integration-cli/fixtures_linux_daemon_test.go
View file

@ -50,7 +50,7 @@ func ensureSyscallTest(ctx context.Context, c *testing.T) {
dockerFile := filepath.Join(tmp, "Dockerfile") dockerFile := filepath.Join(tmp, "Dockerfile")
content := []byte(` content := []byte(`
FROM debian:bullseye-slim FROM debian:bookworm-slim
COPY . /usr/bin/ COPY . /usr/bin/
`) `)
err = os.WriteFile(dockerFile, content, 0o600) err = os.WriteFile(dockerFile, content, 0o600)
@ -66,7 +66,7 @@ func ensureSyscallTest(ctx context.Context, c *testing.T) {
} }
func ensureSyscallTestBuild(ctx context.Context, c *testing.T) { func ensureSyscallTestBuild(ctx context.Context, c *testing.T) {
err := load.FrozenImagesLinux(ctx, testEnv.APIClient(), "debian:bullseye-slim") err := load.FrozenImagesLinux(ctx, testEnv.APIClient(), "debian:bookworm-slim")
assert.NilError(c, err) assert.NilError(c, err)
var buildArgs []string var buildArgs []string
@ -104,7 +104,7 @@ func ensureNNPTest(ctx context.Context, c *testing.T) {
dockerfile := filepath.Join(tmp, "Dockerfile") dockerfile := filepath.Join(tmp, "Dockerfile")
content := ` content := `
FROM debian:bullseye-slim FROM debian:bookworm-slim
COPY . /usr/bin COPY . /usr/bin
RUN chmod +s /usr/bin/nnp-test RUN chmod +s /usr/bin/nnp-test
` `
@ -121,7 +121,7 @@ func ensureNNPTest(ctx context.Context, c *testing.T) {
} }
func ensureNNPTestBuild(ctx context.Context, c *testing.T) { func ensureNNPTestBuild(ctx context.Context, c *testing.T) {
err := load.FrozenImagesLinux(ctx, testEnv.APIClient(), "debian:bullseye-slim") err := load.FrozenImagesLinux(ctx, testEnv.APIClient(), "debian:bookworm-slim")
assert.NilError(c, err) assert.NilError(c, err)
var buildArgs []string var buildArgs []string

4
integration/build/build_userns_linux_test.go
View file

@ -44,7 +44,7 @@ func TestBuildUserNamespaceValidateCapabilitiesAreV2(t *testing.T) {
clientUserRemap := dUserRemap.NewClientT(t) clientUserRemap := dUserRemap.NewClientT(t)
defer clientUserRemap.Close() defer clientUserRemap.Close()
err = load.FrozenImagesLinux(ctx, clientUserRemap, "debian:bullseye-slim") err = load.FrozenImagesLinux(ctx, clientUserRemap, "debian:bookworm-slim")
assert.NilError(t, err) assert.NilError(t, err)
dUserRemapRunning := true dUserRemapRunning := true
@ -56,7 +56,7 @@ func TestBuildUserNamespaceValidateCapabilitiesAreV2(t *testing.T) {
}() }()
dockerfile := ` dockerfile := `
FROM debian:bullseye-slim FROM debian:bookworm-slim
RUN apt-get update && apt-get install -y libcap2-bin --no-install-recommends RUN apt-get update && apt-get install -y libcap2-bin --no-install-recommends
RUN setcap CAP_NET_BIND_SERVICE=+eip /bin/sleep RUN setcap CAP_NET_BIND_SERVICE=+eip /bin/sleep
` `

2
testutil/environment/protect.go
View file

@ -14,7 +14,7 @@ import (
"gotest.tools/v3/assert" "gotest.tools/v3/assert"
) )
var frozenImages = []string{"busybox:latest", "busybox:glibc", "hello-world:frozen", "debian:bullseye-slim"} var frozenImages = []string{"busybox:latest", "busybox:glibc", "hello-world:frozen", "debian:bookworm-slim"}
type protectedElements struct { type protectedElements struct {
containers map[string]struct{} containers map[string]struct{}