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
10 changes: 10 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,16 @@ pull/all:
@echo Pull **all** Docker images
@docker compose -f templates/images-list.yaml pull

.PHONY: docker-build
docker-build:
@echo Building Docker images
@docker compose $(PROFILES) $(PROJECT_DIRECTORY) build

.PHONY: docker-build/all
docker-build/all:
@echo Building **all** Docker images
@docker compose -f templates/images-list.yaml build

.PHONY: u
u:
@$(MAKE) up
Expand Down
2 changes: 1 addition & 1 deletion doc
Submodule doc updated from f578c2 to 172271
5 changes: 5 additions & 0 deletions scripts/jinja/customize.py
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,7 @@ def container(name: str, image: str, _context: _Context, enable_ipv6: typing.Opt
ipv4_forward: typing.Optional[bool] = False,
debug: typing.Optional[str] = 'never',
debug_volume: typing.Optional[bool] = False,
image_build: typing.Optional[str] = None,
) -> str:
'''Add a container'''
containers = {}
Expand All @@ -373,6 +374,7 @@ def container(name: str, image: str, _context: _Context, enable_ipv6: typing.Opt
"container_name": f'{name}-debug',
"network_mode": f'service:{name}',
"image": 'louisroyer/network-debug',
"build": 'https://github.com/louisroyer-docker/network-debug.git#master:network-debug',
"cap_add": ['NET_ADMIN',],
"profiles": ['debug',],
}
Expand Down Expand Up @@ -400,6 +402,8 @@ def container(name: str, image: str, _context: _Context, enable_ipv6: typing.Opt
"hostname": name,
"image": image,
}
if image_build:
containers[name]['build'] = image_build
if command:
containers[name]['command'] = command
elif command is None:
Expand Down Expand Up @@ -437,6 +441,7 @@ def container_setup(name: str) -> str:
"container_name": f'{name}-setup',
"network_mode": f'service:{name}',
"image": 'louisroyer/docker-setup',
"build": 'https://github.com/louisroyer-docker/docker-setup#master:.',
"cap_add": ['NET_ADMIN',],
"restart": "no",
}
Expand Down
Loading
Loading