Skip to content
Snippets Groups Projects
Commit 078462b1 authored by Jan David Mol's avatar Jan David Mol
Browse files

Merge branch 'L2SS-823-add-scratch-dir' into 'master'

L2SS-823: Add scratch directory to interactive containers

Closes L2SS-823

See merge request !363
parents 98fed31f 8a1a9d0d
Branches
Tags
1 merge request!363L2SS-823: Add scratch directory to interactive containers
...@@ -13,6 +13,8 @@ ATTACH_COMPOSE_FILE_ARGS := $(foreach yml,$(filter-out tango.yml,$(COMPOSE_FILES ...@@ -13,6 +13,8 @@ ATTACH_COMPOSE_FILE_ARGS := $(foreach yml,$(filter-out tango.yml,$(COMPOSE_FILES
# But we allow to overwrite it. # But we allow to overwrite it.
NETWORK_MODE ?= tangonet NETWORK_MODE ?= tangonet
SCRATCH ?= /tmp
# Host name through which others can reach our control interfaces. # Host name through which others can reach our control interfaces.
# Needs to be resolvable from the containers and clients. # Needs to be resolvable from the containers and clients.
ifneq (,$(wildcard /run/WSL)) ifneq (,$(wildcard /run/WSL))
...@@ -141,6 +143,7 @@ DOCKER_COMPOSE_ARGS := DISPLAY=$(DISPLAY) \ ...@@ -141,6 +143,7 @@ DOCKER_COMPOSE_ARGS := DISPLAY=$(DISPLAY) \
TANGO_HOST=$(TANGO_HOST) \ TANGO_HOST=$(TANGO_HOST) \
MYSQL_HOST=$(MYSQL_HOST) \ MYSQL_HOST=$(MYSQL_HOST) \
HOSTNAME=$(HOSTNAME) \ HOSTNAME=$(HOSTNAME) \
SCRATCH=$(SCRATCH) \
LOG_HOSTNAME=$(LOG_HOSTNAME) \ LOG_HOSTNAME=$(LOG_HOSTNAME) \
NETWORK_MODE=$(NETWORK_MODE) \ NETWORK_MODE=$(NETWORK_MODE) \
XAUTHORITY_MOUNT=$(XAUTHORITY_MOUNT) \ XAUTHORITY_MOUNT=$(XAUTHORITY_MOUNT) \
......
...@@ -31,6 +31,7 @@ services: ...@@ -31,6 +31,7 @@ services:
volumes: volumes:
- ..:/opt/lofar/tango:rw - ..:/opt/lofar/tango:rw
- ${HOME}:/hosthome - ${HOME}:/hosthome
- ${SCRATCH}:/scratch:rw
environment: environment:
- TANGO_HOST=${TANGO_HOST} - TANGO_HOST=${TANGO_HOST}
- XAUTHORITY=${XAUTHORITY} - XAUTHORITY=${XAUTHORITY}
......
...@@ -29,6 +29,7 @@ services: ...@@ -29,6 +29,7 @@ services:
- ..:/opt/lofar/tango:rw - ..:/opt/lofar/tango:rw
- ../jupyter-notebooks:/jupyter-notebooks:rw - ../jupyter-notebooks:/jupyter-notebooks:rw
- ${HOME}:/hosthome - ${HOME}:/hosthome
- ${SCRATCH}:/scratch:rw
environment: environment:
- TANGO_HOST=${TANGO_HOST} - TANGO_HOST=${TANGO_HOST}
ports: ports:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment