add ipfs

make/apps/common.mk

@@ -13,17 +13,17 @@ bootstrap-app: install-bin-git
 # target bootstrap-docker: Install and configure docker
 # on local host
 .PHONY: bootstrap-docker
-bootstrap-docker: install-bin-docker setup-docker-group
+bootstrap-docker: install-bin-docker setup-docker-group setup-sysctl
 
-# target bootstrap-host: Fire bootstrap-docker target and start node stack
+# target bootstrap-host: Fire node target
 # on local host
 .PHONY: bootstrap-host
-bootstrap-host: bootstrap-docker node
+bootstrap-host: node
 
-# target bootstrap-user: Fire bootstrap-docker target and start user stack
+# target bootstrap-user: Fire User target
 # on local host
 .PHONY: bootstrap-user
-bootstrap-user: bootstrap-docker user
+bootstrap-user: User
 
 # target build: Build application docker images to run
 # on local host

make/apps/def.mk

@@ -1,6 +1,6 @@
 APP_DIR                         ?= $(CURDIR)
-APP_DOMAIN                      ?= $(ENV)$(addprefix .,$(DOMAIN))
-APP_HOST                        ?= $(APP)$(addprefix .,$(APP_DOMAIN))
+APP_DOMAIN                      ?= $(addsuffix .,$(filter-out master,$(ENV)))$(DOMAIN)
+APP_HOST                        ?= $(addsuffix .,$(APP))$(APP_DOMAIN)
 APP_INSTALLED                   ?= $(APPS)
 APP_PARENT                      ?= $(MONOREPO)
 APP_PARENT_DIR                  ?= $(MONOREPO_DIR)

make/apps/myos/def.setup.mk

@@ -1,9 +1,10 @@
+ENV_VARS                        += SETUP_SYSCTL_CONFIG
 SETUP_BINFMT                    ?= false
 SETUP_BINFMT_ARCH               ?= all
 SETUP_NFSD                      ?= false
 SETUP_NFSD_OSX_CONFIG           ?= nfs.server.bonjour=0 nfs.server.mount.regular_files=1 nfs.server.mount.require_resv_port=0 nfs.server.nfsd_threads=16 nfs.server.async=1
 SETUP_SYSCTL                    ?= false
-SETUP_SYSCTL_CONFIG             ?= vm.max_map_count=262144 vm.overcommit_memory=1 fs.file-max=8388608 net.core.somaxconn=1024
+SETUP_SYSCTL_CONFIG             ?= vm.max_map_count=262144 vm.overcommit_memory=1 fs.file-max=8388608 net.core.rmem_max=2500000
 
 define setup-nfsd-osx
 	$(call INFO,setup-nfsd-osx,$(1)$(comma) $(2)$(comma) $(3))

make/apps/myos/setup.mk

@@ -27,7 +27,7 @@ endif
 .PHONY: setup-sysctl
 setup-sysctl:
 ifeq ($(SETUP_SYSCTL),true)
-	$(foreach config,$(SETUP_SYSCTL_CONFIG),$(call docker-run,sysctl -q -w $(config),--privileged alpine) &&) true
+	$(SUDO) sysctl -q -w $(SETUP_SYSCTL_CONFIG)
 endif
 
 # target setup-binfmt: Install binfmt abstraction layer