remove default ENV_VARS
This commit is contained in:
@@ -59,7 +59,6 @@ DOCKER_REPOSITORY ?= $(subst -,/,$(subst _,/,$(COMPOSE_PROJECT_NAM
|
||||
DOCKER_SERVICE ?= $(lastword $(DOCKER_SERVICES))
|
||||
DOCKER_SERVICES ?= $(eval IGNORE_DRYRUN := true)$(eval IGNORE_VERBOSE := true)$(shell $(call docker-compose,config --services) 2>/dev/null)$(eval IGNORE_DRYRUN := false)$(eval IGNORE_VERBOSE := false)
|
||||
DOCKER_SHELL ?= /bin/sh
|
||||
ENV_VARS += COMPOSE_PROJECT_NAME COMPOSE_SERVICE_NAME DOCKER_BUILD_TARGET DOCKER_IMAGE_TAG DOCKER_REGISTRY DOCKER_REPOSITORY DOCKER_SHELL
|
||||
MAKECMDARGS += docker-run docker-run-%
|
||||
|
||||
ifeq ($(DRONE), true)
|
||||
|
||||
@@ -25,7 +25,6 @@ APP_URL ?= $(patsubst %,$(APP_SCHEME)://%,$(APP_URI))
|
||||
CONTEXT += APP APPS BRANCH DOMAIN VERSION RELEASE
|
||||
CONTEXT_DEBUG += APP_DIR APP_URL APP_REPOSITORY APP_UPSTREAM_REPOSITORY ENV_DEPLOY
|
||||
ENV_DEPLOY ?= $(patsubst origin/%,%,$(shell git rev-parse --symbolic --remotes=origin 2>/dev/null |sed '/origin\/HEAD/d'))
|
||||
ENV_VARS += APP_DIR APP_DOMAIN APP_HOST APP_PATH APP_URL CONSUL_HTTP_TOKEN $(if $(filter true,$(MOUNT_NFS)),NFS_CONFIG)
|
||||
MAKECMDARGS += exec exec:% exec@% run run:% run@%
|
||||
MOUNT_NFS ?= false
|
||||
NFS_CONFIG ?= addr=$(NFS_HOST),actimeo=3,intr,noacl,noatime,nocto,nodiratime,nolock,soft,rsize=32768,wsize=32768,tcp,rw,vers=3
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
COMPOSE_IGNORE_ORPHANS := true
|
||||
ENV_VARS += COMPOSE_IGNORE_ORPHANS MYOS_TAGS_JSON
|
||||
HOME ?= /home/$(USER)
|
||||
MAKECMDARGS += ssh-run
|
||||
MYOS_TAGS_VARS ?= env user
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
ENV_VARS += SETUP_SYSCTL_CONFIG
|
||||
SETUP_BINFMT ?= false
|
||||
SETUP_BINFMT_ARCH ?= all
|
||||
SETUP_NFSD ?= false
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
DOCKER_BUILD_VARS += $(SSH_ENV_VARS)
|
||||
ENV_VARS += $(SSH_ENV_VARS)
|
||||
SSH_AUTHORIZED_KEYS ?= $(SSH_GITHUB_AUTHORIZED_KEYS)
|
||||
SSH_BASTION_HOSTNAME ?=
|
||||
SSH_BASTION_USERNAME ?= $(SSH_USER)
|
||||
|
||||
Reference in New Issue
Block a user