mirror of
https://github.com/docker/compose.git
synced 2026-02-09 01:59:22 +08:00
56ab28aef3
Until now, mustRecreate logic only checked for divergence in TypeVolume mounts but ignored TypeImage mounts. This inconsistency caused containers to erroneously retain stale images even after the source image was rebuilt. This commit updates ensureImagesExists to resolve image volume sources to their digests using the official reference package. This enables ServiceHash (config hash) to naturally detect underlying image digest changes, triggering recreation via the standard convergence logic. An E2E test case is added to verify this behavior. Fixes #13547 Signed-off-by: ibrahim yapar <74625807+ibrahimypr@users.noreply.github.com>
237 lines
9.9 KiB
Go
237 lines
9.9 KiB
Go
/*
|
|
Copyright 2020 Docker Compose CLI authors
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package e2e
|
|
|
|
import (
|
|
"fmt"
|
|
"net/http"
|
|
"path/filepath"
|
|
"runtime"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
|
|
"gotest.tools/v3/assert"
|
|
"gotest.tools/v3/icmd"
|
|
)
|
|
|
|
func TestLocalComposeVolume(t *testing.T) {
|
|
c := NewParallelCLI(t)
|
|
|
|
const projectName = "compose-e2e-volume"
|
|
|
|
t.Run("up with build and no image name, volume", func(t *testing.T) {
|
|
// ensure local test run does not reuse previously build image
|
|
c.RunDockerOrExitError(t, "rmi", "compose-e2e-volume-nginx")
|
|
c.RunDockerOrExitError(t, "volume", "rm", projectName+"-staticVol")
|
|
c.RunDockerOrExitError(t, "volume", "rm", "myvolume")
|
|
c.RunDockerComposeCmd(t, "--project-directory", "fixtures/volume-test", "--project-name", projectName, "up",
|
|
"-d")
|
|
})
|
|
|
|
t.Run("access bind mount data", func(t *testing.T) {
|
|
output := HTTPGetWithRetry(t, "http://localhost:8090", http.StatusOK, 2*time.Second, 20*time.Second)
|
|
assert.Assert(t, strings.Contains(output, "Hello from Nginx container"))
|
|
})
|
|
|
|
t.Run("check container volume specs", func(t *testing.T) {
|
|
res := c.RunDockerCmd(t, "inspect", "compose-e2e-volume-nginx2-1", "--format", "{{ json .Mounts }}")
|
|
output := res.Stdout()
|
|
assert.Assert(t, strings.Contains(output, `"Destination":"/usr/src/app/node_modules","Driver":"local","Mode":"z","RW":true,"Propagation":""`), output)
|
|
assert.Assert(t, strings.Contains(output, `"Destination":"/myconfig","Mode":"","RW":false,"Propagation":"rprivate"`), output)
|
|
})
|
|
|
|
t.Run("check config content", func(t *testing.T) {
|
|
output := c.RunDockerCmd(t, "exec", "compose-e2e-volume-nginx2-1", "cat", "/myconfig").Stdout()
|
|
assert.Assert(t, strings.Contains(output, `Hello from Nginx container`), output)
|
|
})
|
|
|
|
t.Run("check secrets content", func(t *testing.T) {
|
|
output := c.RunDockerCmd(t, "exec", "compose-e2e-volume-nginx2-1", "cat", "/run/secrets/mysecret").Stdout()
|
|
assert.Assert(t, strings.Contains(output, `Hello from Nginx container`), output)
|
|
})
|
|
|
|
t.Run("check container bind-mounts specs", func(t *testing.T) {
|
|
res := c.RunDockerCmd(t, "inspect", "compose-e2e-volume-nginx-1", "--format", "{{ json .Mounts }}")
|
|
output := res.Stdout()
|
|
assert.Assert(t, strings.Contains(output, `"Type":"bind"`))
|
|
assert.Assert(t, strings.Contains(output, `"Destination":"/usr/share/nginx/html"`))
|
|
})
|
|
|
|
t.Run("should inherit anonymous volumes", func(t *testing.T) {
|
|
c.RunDockerOrExitError(t, "exec", "compose-e2e-volume-nginx2-1", "touch", "/usr/src/app/node_modules/test")
|
|
c.RunDockerComposeCmd(t, "--project-directory", "fixtures/volume-test", "--project-name", projectName, "up", "--force-recreate", "-d")
|
|
c.RunDockerOrExitError(t, "exec", "compose-e2e-volume-nginx2-1", "ls", "/usr/src/app/node_modules/test")
|
|
})
|
|
|
|
t.Run("should renew anonymous volumes", func(t *testing.T) {
|
|
c.RunDockerOrExitError(t, "exec", "compose-e2e-volume-nginx2-1", "touch", "/usr/src/app/node_modules/test")
|
|
c.RunDockerComposeCmd(t, "--project-directory", "fixtures/volume-test", "--project-name", projectName, "up", "--force-recreate", "--renew-anon-volumes", "-d")
|
|
c.RunDockerOrExitError(t, "exec", "compose-e2e-volume-nginx2-1", "ls", "/usr/src/app/node_modules/test")
|
|
})
|
|
|
|
t.Run("cleanup volume project", func(t *testing.T) {
|
|
c.RunDockerComposeCmd(t, "--project-name", projectName, "down", "--volumes")
|
|
ls := c.RunDockerCmd(t, "volume", "ls").Stdout()
|
|
assert.Assert(t, !strings.Contains(ls, projectName+"-staticVol"))
|
|
assert.Assert(t, !strings.Contains(ls, "myvolume"))
|
|
})
|
|
}
|
|
|
|
func TestProjectVolumeBind(t *testing.T) {
|
|
if composeStandaloneMode {
|
|
t.Skip()
|
|
}
|
|
c := NewParallelCLI(t)
|
|
const projectName = "compose-e2e-project-volume-bind"
|
|
|
|
t.Run("up on project volume with bind specification", func(t *testing.T) {
|
|
if runtime.GOOS == "windows" {
|
|
t.Skip("Running on Windows. Skipping...")
|
|
}
|
|
tmpDir := t.TempDir()
|
|
|
|
c.RunDockerComposeCmd(t, "--project-name", projectName, "down")
|
|
|
|
c.RunDockerOrExitError(t, "volume", "rm", "-f", projectName+"_project-data").Assert(t, icmd.Success)
|
|
cmd := c.NewCmdWithEnv([]string{"TEST_DIR=" + tmpDir},
|
|
"docker", "compose", "--project-directory", "fixtures/project-volume-bind-test", "--project-name", projectName, "up", "-d")
|
|
icmd.RunCmd(cmd).Assert(t, icmd.Success)
|
|
defer c.RunDockerComposeCmd(t, "--project-name", projectName, "down")
|
|
|
|
c.RunCmd(t, "sh", "-c", "echo SUCCESS > "+filepath.Join(tmpDir, "resultfile")).Assert(t, icmd.Success)
|
|
|
|
ret := c.RunDockerOrExitError(t, "exec", "frontend", "bash", "-c", "cat /data/resultfile").Assert(t, icmd.Success)
|
|
assert.Assert(t, strings.Contains(ret.Stdout(), "SUCCESS"))
|
|
})
|
|
}
|
|
|
|
func TestUpSwitchVolumes(t *testing.T) {
|
|
c := NewCLI(t)
|
|
const projectName = "compose-e2e-switch-volumes"
|
|
t.Cleanup(func() {
|
|
c.cleanupWithDown(t, projectName)
|
|
c.RunDockerCmd(t, "volume", "rm", "-f", "test_external_volume")
|
|
c.RunDockerCmd(t, "volume", "rm", "-f", "test_external_volume_2")
|
|
})
|
|
|
|
c.RunDockerCmd(t, "volume", "create", "test_external_volume")
|
|
c.RunDockerCmd(t, "volume", "create", "test_external_volume_2")
|
|
|
|
c.RunDockerComposeCmd(t, "-f", "./fixtures/switch-volumes/compose.yaml", "--project-name", projectName, "up", "-d")
|
|
|
|
res := c.RunDockerCmd(t, "inspect", fmt.Sprintf("%s-app-1", projectName), "-f", "{{ (index .Mounts 0).Name }}")
|
|
res.Assert(t, icmd.Expected{Out: "test_external_volume"})
|
|
|
|
c.RunDockerComposeCmd(t, "-f", "./fixtures/switch-volumes/compose2.yaml", "--project-name", projectName, "up", "-d")
|
|
res = c.RunDockerCmd(t, "inspect", fmt.Sprintf("%s-app-1", projectName), "-f", "{{ (index .Mounts 0).Name }}")
|
|
res.Assert(t, icmd.Expected{Out: "test_external_volume_2"})
|
|
}
|
|
|
|
func TestUpRecreateVolumes(t *testing.T) {
|
|
c := NewCLI(t)
|
|
const projectName = "compose-e2e-recreate-volumes"
|
|
t.Cleanup(func() {
|
|
c.cleanupWithDown(t, projectName)
|
|
})
|
|
|
|
c.RunDockerComposeCmd(t, "-f", "./fixtures/recreate-volumes/compose.yaml", "--project-name", projectName, "up", "-d")
|
|
|
|
res := c.RunDockerCmd(t, "volume", "inspect", fmt.Sprintf("%s_my_vol", projectName), "-f", "{{ index .Labels \"foo\" }}")
|
|
res.Assert(t, icmd.Expected{Out: "bar"})
|
|
|
|
c.RunDockerComposeCmd(t, "-f", "./fixtures/recreate-volumes/compose2.yaml", "--project-name", projectName, "up", "-d", "-y")
|
|
res = c.RunDockerCmd(t, "volume", "inspect", fmt.Sprintf("%s_my_vol", projectName), "-f", "{{ index .Labels \"foo\" }}")
|
|
res.Assert(t, icmd.Expected{Out: "zot"})
|
|
}
|
|
|
|
func TestUpRecreateVolumes_IgnoreBinds(t *testing.T) {
|
|
c := NewCLI(t)
|
|
const projectName = "compose-e2e-recreate-volumes"
|
|
t.Cleanup(func() {
|
|
c.cleanupWithDown(t, projectName)
|
|
})
|
|
|
|
c.RunDockerComposeCmd(t, "-f", "./fixtures/recreate-volumes/bind.yaml", "--project-name", projectName, "up", "-d")
|
|
|
|
res := c.RunDockerComposeCmd(t, "-f", "./fixtures/recreate-volumes/bind.yaml", "--project-name", projectName, "up", "-d")
|
|
assert.Check(t, !strings.Contains(res.Combined(), "Recreated"))
|
|
}
|
|
|
|
func TestImageVolume(t *testing.T) {
|
|
c := NewCLI(t)
|
|
const projectName = "compose-e2e-image-volume"
|
|
t.Cleanup(func() {
|
|
c.cleanupWithDown(t, projectName)
|
|
})
|
|
|
|
version := c.RunDockerCmd(t, "version", "-f", "{{.Server.Version}}")
|
|
major, _, found := strings.Cut(version.Combined(), ".")
|
|
assert.Assert(t, found)
|
|
if major == "26" || major == "27" {
|
|
t.Skip("Skipping test due to docker version < 28")
|
|
}
|
|
|
|
res := c.RunDockerComposeCmd(t, "-f", "./fixtures/volumes/compose.yaml", "--project-name", projectName, "up", "with_image")
|
|
out := res.Combined()
|
|
assert.Check(t, strings.Contains(out, "index.html"))
|
|
}
|
|
|
|
func TestImageVolumeRecreateOnRebuild(t *testing.T) {
|
|
c := NewCLI(t)
|
|
const projectName = "compose-e2e-image-volume-recreate"
|
|
t.Cleanup(func() {
|
|
c.cleanupWithDown(t, projectName)
|
|
c.RunDockerOrExitError(t, "rmi", "-f", "image-volume-source")
|
|
})
|
|
|
|
version := c.RunDockerCmd(t, "version", "-f", "{{.Server.Version}}")
|
|
major, _, found := strings.Cut(version.Combined(), ".")
|
|
assert.Assert(t, found)
|
|
if major == "26" || major == "27" {
|
|
t.Skip("Skipping test due to docker version < 28")
|
|
}
|
|
|
|
// First build and run with initial content
|
|
c.RunDockerComposeCmd(t, "-f", "./fixtures/image-volume-recreate/compose.yaml",
|
|
"--project-name", projectName, "build", "--build-arg", "CONTENT=foo")
|
|
res := c.RunDockerComposeCmd(t, "-f", "./fixtures/image-volume-recreate/compose.yaml",
|
|
"--project-name", projectName, "up", "-d")
|
|
assert.Check(t, !strings.Contains(res.Combined(), "error"))
|
|
|
|
// Check initial content
|
|
res = c.RunDockerComposeCmd(t, "-f", "./fixtures/image-volume-recreate/compose.yaml",
|
|
"--project-name", projectName, "logs", "consumer")
|
|
assert.Check(t, strings.Contains(res.Combined(), "foo"), "Expected 'foo' in output, got: %s", res.Combined())
|
|
|
|
// Rebuild source image with different content
|
|
c.RunDockerComposeCmd(t, "-f", "./fixtures/image-volume-recreate/compose.yaml",
|
|
"--project-name", projectName, "build", "--build-arg", "CONTENT=bar")
|
|
|
|
// Run up again - consumer should be recreated because source image changed
|
|
res = c.RunDockerComposeCmd(t, "-f", "./fixtures/image-volume-recreate/compose.yaml",
|
|
"--project-name", projectName, "up", "-d")
|
|
// The consumer container should be recreated
|
|
assert.Check(t, strings.Contains(res.Combined(), "Recreate") || strings.Contains(res.Combined(), "Created"),
|
|
"Expected container to be recreated, got: %s", res.Combined())
|
|
|
|
// Check updated content
|
|
res = c.RunDockerComposeCmd(t, "-f", "./fixtures/image-volume-recreate/compose.yaml",
|
|
"--project-name", projectName, "logs", "consumer")
|
|
assert.Check(t, strings.Contains(res.Combined(), "bar"), "Expected 'bar' in output after rebuild, got: %s", res.Combined())
|
|
}
|