Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion compose/config/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -728,9 +728,22 @@ def validate_extended_service_dict(service_dict, filename, service):


def validate_service(service_config, service_names, config_file):
def build_image():
args = sys.argv[1:]
if 'pull' in args:
return False

if '--no-build' in args:
return False

return True

service_dict, service_name = service_config.config, service_config.name
validate_service_constraints(service_dict, service_name, config_file)
validate_paths(service_dict)

if build_image():
# We only care about valid paths when actually building images
validate_paths(service_dict)

validate_cpu(service_config)
validate_ulimits(service_config)
Expand Down
14 changes: 14 additions & 0 deletions tests/acceptance/cli_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -748,6 +748,20 @@ def test_build_no_cache(self):
assert BUILD_CACHE_TEXT not in result.stdout
assert BUILD_PULL_TEXT not in result.stdout

def test_up_ignore_missing_build_directory(self):
self.base_dir = 'tests/fixtures/no-build'
result = self.dispatch(['up', '--no-build'])

assert 'alpine exited with code 0' in result.stdout
self.base_dir = None

def test_pull_ignore_missing_build_directory(self):
self.base_dir = 'tests/fixtures/no-build'
result = self.dispatch(['pull'])

assert 'Pulling my-alpine' in result.stderr
self.base_dir = None

def test_build_pull(self):
# Make sure we have the latest busybox already
pull_busybox(self.client)
Expand Down
8 changes: 8 additions & 0 deletions tests/fixtures/no-build/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
version: "3"
services:
my-alpine:
image: alpine:3.12
container_name: alpine
entrypoint: 'echo It works!'
build:
context: /this/path/doesnt/exist # and we don't really care. We just want to run containers already pulled.