wip: stalled changes

make/apps/common.mk

@@ -192,6 +192,7 @@ ssh@%:
 ## it updates COMPOSE_FILE with all .yml files of the current stack
 .PHONY: stack
 stack:
+	$(call compose-file,docker)
 	$(foreach stackz,$(STACK),$(call docker-stack,$(stackz)))
 	$(call compose-file,$(MYOS_STACK),$(MYOS_STACK_FILE))
 

make/def.docker.mk

@@ -3,7 +3,7 @@ DOCKER_ENV_ARGS                 ?= $(docker_env_args)
 DOCKER_EXEC_OPTIONS             ?=
 DOCKER_GID                      ?= $(call gid,docker)
 DOCKER_IMAGE                    ?= $(USER_DOCKER_IMAGE)
-DOCKER_MACHINE                  := $(shell docker run --rm alpine uname -m 2>/dev/null)
+DOCKER_MACHINE                  ?= $(shell docker run --rm alpine uname -m 2>/dev/null)
 DOCKER_NAME                     ?= $(USER_DOCKER_NAME)
 DOCKER_NETWORK                  ?= $(if $(USER_STACK),$(USER),$(DOCKER_NETWORK_PRIVATE))
 DOCKER_NETWORK_PRIVATE          ?= $(USER)-$(ENV)
@@ -16,7 +16,7 @@ DOCKER_RUN_NETWORK              += --network $(DOCKER_NETWORK)
 DOCKER_RUN_OPTIONS              += --rm
 DOCKER_RUN_VOLUME               ?= $(patsubst %,-v %,$(DOCKER_VOLUME))
 DOCKER_RUN_WORKDIR              ?= $(if $(DOCKER_WORKDIR),-w $(DOCKER_WORKDIR))
-DOCKER_SYSTEM                   := $(shell docker run --rm alpine uname -s 2>/dev/null)
+DOCKER_SYSTEM                   ?= $(shell docker run --rm alpine uname -s 2>/dev/null)
 DOCKER_VOLUME                   ?= /var/run/docker.sock:/var/run/docker.sock
 DOCKER_WORKDIR                  ?= $(PWD)
 ENV_VARS                        += DOCKER_MACHINE DOCKER_NETWORK DOCKER_NETWORK_PRIVATE DOCKER_NETWORK_PUBLIC DOCKER_SYSTEM HOST_COMPOSE_PROJECT_NAME HOST_COMPOSE_SERVICE_NAME HOST_DOCKER_REPOSITORY HOST_DOCKER_VOLUME HOST_GID HOST_UID USER_COMPOSE_PROJECT_NAME USER_COMPOSE_SERVICE_NAME USER_DOCKER_IMAGE USER_DOCKER_NAME USER_DOCKER_REPOSITORY USER_DOCKER_VOLUME