From 9ef0daa94f4a005cc568675491e4287f1f04e8d0 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Tue, 14 Jun 2022 16:23:01 +0200
Subject: [PATCH] L2SS-823: Add scratch directory to interactive containers
---
docker-compose/Makefile | 3 +++
docker-compose/itango.yml | 1 +
docker-compose/jupyter.yml | 1 +
3 files changed, 5 insertions(+)
diff --git a/docker-compose/Makefile b/docker-compose/Makefile
index b64d7ff70..391d6d15b 100644
--- a/docker-compose/Makefile
+++ b/docker-compose/Makefile
@@ -13,6 +13,8 @@ ATTACH_COMPOSE_FILE_ARGS := $(foreach yml,$(filter-out tango.yml,$(COMPOSE_FILES
# But we allow to overwrite it.
NETWORK_MODE ?= tangonet
+SCRATCH ?= $(HOME)
+
# Host name through which others can reach our control interfaces.
# Needs to be resolvable from the containers and clients.
ifneq (,$(wildcard /run/WSL))
@@ -141,6 +143,7 @@ DOCKER_COMPOSE_ARGS := DISPLAY=$(DISPLAY) \
TANGO_HOST=$(TANGO_HOST) \
MYSQL_HOST=$(MYSQL_HOST) \
HOSTNAME=$(HOSTNAME) \
+ SCRATCH=$(SCRATCH) \
LOG_HOSTNAME=$(LOG_HOSTNAME) \
NETWORK_MODE=$(NETWORK_MODE) \
XAUTHORITY_MOUNT=$(XAUTHORITY_MOUNT) \
diff --git a/docker-compose/itango.yml b/docker-compose/itango.yml
index 3e3df5a53..b728454cc 100644
--- a/docker-compose/itango.yml
+++ b/docker-compose/itango.yml
@@ -31,6 +31,7 @@ services:
volumes:
- ..:/opt/lofar/tango:rw
- ${HOME}:/hosthome
+ - ${SCRATCH}:/scratch:rw
environment:
- TANGO_HOST=${TANGO_HOST}
- XAUTHORITY=${XAUTHORITY}
diff --git a/docker-compose/jupyter.yml b/docker-compose/jupyter.yml
index 8bc6eb8ce..c8b67ae29 100644
--- a/docker-compose/jupyter.yml
+++ b/docker-compose/jupyter.yml
@@ -29,6 +29,7 @@ services:
- ..:/opt/lofar/tango:rw
- ../jupyter-notebooks:/jupyter-notebooks:rw
- ${HOME}:/hosthome
+ - ${SCRATCH}:/scratch:rw
environment:
- TANGO_HOST=${TANGO_HOST}
ports:
--
GitLab