From 7161f6be9930ab0500f634d3bd0d36844b3414b4 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Tue, 6 Apr 2021 13:07:36 +0200
Subject: [PATCH] Renamed LOFAR_UID -> CONTAINER_EXECUTION_UID
---
docker-compose/Makefile | 2 +-
docker-compose/device-pcc.yml | 2 +-
docker-compose/device-sdp.yml | 2 +-
docker-compose/jupyter.yml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/docker-compose/Makefile b/docker-compose/Makefile
index 94bbd94d9..693bc26cb 100644
--- a/docker-compose/Makefile
+++ b/docker-compose/Makefile
@@ -82,7 +82,7 @@ endif
DOCKER_COMPOSE_ARGS := DISPLAY=$(DISPLAY) XAUTHORITY=$(XAUTHORITY) TANGO_HOST=$(TANGO_HOST) \
NETWORK_MODE=$(NETWORK_MODE) XAUTHORITY_MOUNT=$(XAUTHORITY_MOUNT) TANGO_SKA_CONTAINER_MOUNT=$(TANGO_SKA_CONTAINER_MOUNT) TANGO_LOFAR_CONTAINER_MOUNT=$(TANGO_LOFAR_CONTAINER_MOUNT) TANGO_LOFAR_CONTAINER_DIR=${TANGO_LOFAR_CONTAINER_DIR} MYSQL_HOST=$(MYSQL_HOST) \
- CONTAINER_NAME_PREFIX=$(CONTAINER_NAME_PREFIX) COMPOSE_IGNORE_ORPHANS=true LOFAR_UID=$(shell id -u)
+ CONTAINER_NAME_PREFIX=$(CONTAINER_NAME_PREFIX) COMPOSE_IGNORE_ORPHANS=true CONTAINER_EXECUTION_UID=$(shell id -u)
.PHONY: up down minimal start stop status clean pull help
diff --git a/docker-compose/device-pcc.yml b/docker-compose/device-pcc.yml
index 6b149a77b..97c744339 100644
--- a/docker-compose/device-pcc.yml
+++ b/docker-compose/device-pcc.yml
@@ -21,7 +21,7 @@ services:
- ${TANGO_LOFAR_CONTAINER_MOUNT}
environment:
- TANGO_HOST=${TANGO_HOST}
- user: ${LOFAR_UID}
+ user: ${CONTAINER_EXECUTION_UID}
entrypoint:
- /usr/local/bin/wait-for-it.sh
- ${TANGO_HOST}
diff --git a/docker-compose/device-sdp.yml b/docker-compose/device-sdp.yml
index 293c38c1e..4d908cf89 100644
--- a/docker-compose/device-sdp.yml
+++ b/docker-compose/device-sdp.yml
@@ -21,7 +21,7 @@ services:
- ${TANGO_LOFAR_CONTAINER_MOUNT}
environment:
- TANGO_HOST=${TANGO_HOST}
- user: ${LOFAR_UID}
+ user: ${CONTAINER_EXECUTION_UID}
entrypoint:
- /usr/local/bin/wait-for-it.sh
- ${TANGO_HOST}
diff --git a/docker-compose/jupyter.yml b/docker-compose/jupyter.yml
index d5aed24cc..96448d545 100644
--- a/docker-compose/jupyter.yml
+++ b/docker-compose/jupyter.yml
@@ -26,7 +26,7 @@ services:
- DISPLAY=${DISPLAY}
ports:
- "8888:8888"
- user: ${LOFAR_UID}
+ user: ${CONTAINER_EXECUTION_UID}
working_dir: /jupyter-notebooks
entrypoint:
- /usr/local/bin/wait-for-it.sh
--
GitLab