tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-07 05:44:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1381 from gtardif/fix_up_build

Browse Source 
Fix compose up --build not forcing rebuild of present image
This commit is contained in:
Nicolas De loof 2021-03-02 18:57:34 +01:00 committed by GitHub
commit 12ffdd1405
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 42 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
local/compose/build.go
View File

@ -69,11 +69,6 @@ func (s *composeService) ensureImagesExists(ctx context.Context, project *types.
return err return err
} }
if service.Image != "" {
if localImagePresent {
continue
}
}
if service.Build != nil { if service.Build != nil {
if localImagePresent && service.PullPolicy != types.PullPolicyBuild { if localImagePresent && service.PullPolicy != types.PullPolicyBuild {
continue continue
@ -82,6 +77,11 @@ func (s *composeService) ensureImagesExists(ctx context.Context, project *types.
opts[imageName] = s.toBuildOptions(service, project.WorkingDir, imageName) opts[imageName] = s.toBuildOptions(service, project.WorkingDir, imageName)
continue continue
} }
if service.Image != "" {
if localImagePresent {
continue
}
}
// Buildx has no command to "just pull", see // Buildx has no command to "just pull", see
// so we bake a temporary dockerfile that will just pull and export pulled image // so we bake a temporary dockerfile that will just pull and export pulled image

10
local/e2e/compose/compose_build_test.go
View File

@ -53,6 +53,7 @@ func TestLocalComposeBuild(t *testing.T) {
}) })
res.Assert(t, icmd.Expected{Out: "COPY static /usr/share/nginx/html"}) res.Assert(t, icmd.Expected{Out: "COPY static /usr/share/nginx/html"})
res.Assert(t, icmd.Expected{Out: "COPY static2 /usr/share/nginx/html"})
output := HTTPGetWithRetry(t, "http://localhost:8070", http.StatusOK, 2*time.Second, 20*time.Second) output := HTTPGetWithRetry(t, "http://localhost:8070", http.StatusOK, 2*time.Second, 20*time.Second)
assert.Assert(t, strings.Contains(output, "Hello from Nginx container")) assert.Assert(t, strings.Contains(output, "Hello from Nginx container"))
@ -64,7 +65,14 @@ func TestLocalComposeBuild(t *testing.T) {
t.Run("no rebuild when up again", func(t *testing.T) { t.Run("no rebuild when up again", func(t *testing.T) {
res := c.RunDockerCmd("compose", "--project-directory", "fixtures/build-test", "up", "-d") res := c.RunDockerCmd("compose", "--project-directory", "fixtures/build-test", "up", "-d")
assert.Assert(t, !strings.Contains(res.Stdout(), "COPY static /usr/share/nginx/html"), res.Stdout()) assert.Assert(t, !strings.Contains(res.Stdout(), "COPY static"), res.Stdout())
})
t.Run("rebuild when up --build", func(t *testing.T) {
res := c.RunDockerCmd("compose", "--workdir", "fixtures/build-test", "up", "-d", "--build")
res.Assert(t, icmd.Expected{Out: "COPY static /usr/share/nginx/html"})
res.Assert(t, icmd.Expected{Out: "COPY static2 /usr/share/nginx/html"})
}) })
t.Run("cleanup build project", func(t *testing.T) { t.Run("cleanup build project", func(t *testing.T) {

2
local/e2e/compose/fixtures/build-test/compose.yml
View File

@ -5,5 +5,5 @@ services:
- 8070:80 - 8070:80
nginx2: nginx2:
build: nginx-build build: nginx-build2
image: custom-nginx image: custom-nginx

17
local/e2e/compose/fixtures/build-test/nginx-build2/Dockerfile Normal file
View File

@ -0,0 +1,17 @@
# 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.
FROM nginx
COPY static2 /usr/share/nginx/html

10
local/e2e/compose/fixtures/build-test/nginx-build2/static2/index.html Normal file
View File

@ -0,0 +1,10 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Docker Nginx</title>
</head>
<body>
<h2>Hello from Nginx container</h2>
</body>
</html>