node is host
This commit is contained in:
parent
31608784f6
commit
83b4422502
|
@ -5,8 +5,8 @@ services:
|
|||
build:
|
||||
args:
|
||||
- DOCKER_REPOSITORY=${DOCKER_REPOSITORY}
|
||||
- GID=${NODE_GID}
|
||||
- UID=${NODE_UID}
|
||||
- GID=${HOST_GID}
|
||||
- UID=${HOST_UID}
|
||||
container_name: ${COMPOSE_PROJECT_NAME}-astroport
|
||||
environment:
|
||||
- ENV=${ENV}
|
||||
|
@ -15,7 +15,7 @@ services:
|
|||
labels:
|
||||
- SERVICE_1234_CHECK_HTTP=/test
|
||||
- SERVICE_1234_NAME=${COMPOSE_SERVICE_NAME}-astroport-1234
|
||||
- SERVICE_1234_TAGS=${NODE_ASTROPORT_SERVICE_1234_TAGS:-}
|
||||
- SERVICE_1234_TAGS=${HOST_ASTROPORT_SERVICE_1234_TAGS:-}
|
||||
volumes:
|
||||
- dns:/dns
|
||||
|
||||
|
|
|
@ -9,8 +9,8 @@ services:
|
|||
- SYS_ADMIN # ecryptfs
|
||||
environment:
|
||||
- DEBUG=${VDI_DEBUG:-}
|
||||
- ECRYPTERS=${NODE_VDI_ECRYPTERS:-zen}
|
||||
- LANG=${NODE_VDI_LANG:-}
|
||||
- ECRYPTERS=${HOST_VDI_ECRYPTERS:-zen}
|
||||
- LANG=${HOST_VDI_LANG:-}
|
||||
- RC_00_SOURCE=${USER_RC_SOURCE:-/etc/profile.d/rc_functions.sh}
|
||||
- RC_01_PS1_SET=${USER_RC_PS1_SET:-true}
|
||||
- RC_02_PROMPT_SET=${USER_RC_PROMPT_SET:-true}
|
||||
|
@ -20,9 +20,9 @@ services:
|
|||
- SSH_AUTHORIZED_KEYS=${SSH_AUTHORIZED_KEYS:-}
|
||||
- SSH_PORT=${SSH_PORT:-22}
|
||||
- SSH_PUBLIC_HOSTS=${SSH_PUBLIC_HOSTS:-}
|
||||
- SUDOERS=${NODE_VDI_SUDOERS:-zen}
|
||||
- TZ=${NODE_VDI_TZ:-:-{TZ}}
|
||||
- USERS=${NODE_VDI_USERS:-zen}
|
||||
- SUDOERS=${HOST_VDI_SUDOERS:-zen}
|
||||
- TZ=${HOST_VDI_TZ:-:-{TZ}}
|
||||
- USERS=${HOST_VDI_USERS:-zen}
|
||||
security_opt:
|
||||
- apparmor=unconfined # ecryptfs
|
||||
- seccomp=unconfined # ecryptfs
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
DOCKER_IMAGES_MYOS := x2go:xfce-debian
|
||||
ENV_VARS += NODE_ASTROPORT_SERVICE_1234_TAGS
|
||||
COMPOSE_FILE_VDI := true
|
||||
MAKE_VARS += SSH_PORT User node
|
||||
NODE_ASTROPORT_SERVICE_1234_TAGS ?= urlprefix-astroport.$(DOMAIN)/
|
||||
SERVICE := astroport
|
||||
SSH_PORT := 45720
|
||||
SSH_PUBLIC_HOSTS += git.p2p.legal
|
||||
STACK := node
|
||||
UFW_UPDATE_ASTROPORT := 1234/tcp 12245:12445/tcp 45720/tcp
|
||||
User := User/ipfs
|
||||
node := node/ipfs
|
||||
COMPOSE_FILE_VDI := true
|
||||
DOCKER_IMAGES_MYOS := x2go:xfce-debian
|
||||
ENV_VARS += HOST_ASTROPORT_SERVICE_1234_TAGS
|
||||
HOST_ASTROPORT_SERVICE_1234_TAGS ?= urlprefix-astroport.$(DOMAIN)/
|
||||
HOST_ASTROPORT_UFW_UPDATE := 1234/tcp 12245:12445/tcp 45720/tcp
|
||||
MAKE_VARS += SSH_PORT User host
|
||||
SERVICE := astroport
|
||||
SSH_PORT := 45720
|
||||
SSH_PUBLIC_HOSTS := git.p2p.legal
|
||||
STACK := host
|
||||
User := User/ipfs
|
||||
host := host/ipfs
|
||||
|
|
Loading…
Reference in New Issue