diff options
| -rw-r--r-- | Dockerfile | 4 | ||||
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | docker-bake.hcl | 7 |
3 files changed, 6 insertions, 9 deletions
diff --git a/Dockerfile b/Dockerfile index 2606e856dd..1d0a42b149 100644 --- a/Dockerfile +++ b/Dockerfile @@ -476,7 +476,7 @@ RUN --mount=type=cache,sharing=locked,id=moby-dev-aptlib,target=/var/lib/apt \ systemd-sysv ENTRYPOINT ["hack/dind-systemd"] -FROM dev-systemd-${SYSTEMD} AS dev +FROM dev-systemd-${SYSTEMD} AS dev-base ARG DEBIAN_FRONTEND RUN groupadd -r docker RUN useradd --create-home --gid docker unprivilegeduser \ @@ -600,5 +600,5 @@ COPY --from=build /build/ / # usage: # > make shell # > SYSTEMD=true make shell -FROM dev AS final +FROM dev-base AS dev COPY . . @@ -179,9 +179,9 @@ run: build ## run the docker daemon in a container .PHONY: build ifeq ($(BIND_DIR), .) -build: shell_target := --target=dev +build: shell_target := --target=dev-base else -build: shell_target := --target=final +build: shell_target := --target=dev endif build: bundles $(BUILD_CMD) $(BUILD_OPTS) $(shell_target) --load -t "$(DOCKER_IMAGE)" . diff --git a/docker-bake.hcl b/docker-bake.hcl index 46b110e45f..98e02cca98 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -128,19 +128,16 @@ target "binary-cross" { # dev # -variable "DEV_IMAGE" { - default = "docker-dev" -} variable "SYSTEMD" { default = "false" } target "dev" { inherits = ["_common"] - target = "final" + target = "dev" args = { SYSTEMD = SYSTEMD } - tags = [DEV_IMAGE] + tags = ["docker-dev"] output = ["type=docker"] } |