Skip to content
Snippets Groups Projects
Commit c6f436a6 authored by Thomas Juerges's avatar Thomas Juerges
Browse files

Add automatic chmod a+r ~/.Xauthority on Linux

parent f153dcef
No related branches found
No related tags found
No related merge requests found
...@@ -49,7 +49,8 @@ else ...@@ -49,7 +49,8 @@ else
ifeq ($(UNAME_S),Linux) ifeq ($(UNAME_S),Linux)
DISPLAY ?= :0.0 DISPLAY ?= :0.0
NETWORK_MODE ?= host NETWORK_MODE ?= host
XAUTHORITY_MOUNT := /tmp/.X11-unix:/tmp/.X11-unix XAUTHORITY_FILE ?= /tmp/.X11-unix
XAUTHORITY_MOUNT := $(XAUTHORITY_FILE):/tmp/.X11-unix
XAUTHORITY ?= /hosthome/.Xauthority XAUTHORITY ?= /hosthome/.Xauthority
# /bin/sh (=dash) does not evaluate 'docker network' conditionals correctly # /bin/sh (=dash) does not evaluate 'docker network' conditionals correctly
SHELL := /bin/bash SHELL := /bin/bash
...@@ -63,7 +64,8 @@ else ...@@ -63,7 +64,8 @@ else
ADD_TO_XHOST := $(shell xhost +$(IP_ADDRESS)) ADD_TO_XHOST := $(shell xhost +$(IP_ADDRESS))
# network_mode = host doesn't work on MacOS, so fix to the internal network # network_mode = host doesn't work on MacOS, so fix to the internal network
NETWORK_MODE ?= tangonet NETWORK_MODE ?= tangonet
XAUTHORITY_MOUNT := $(HOME)/.Xauthority:/hosthome/.Xauthority:ro XAUTHORITY_FILE ?= $(HOME)/.Xauthority
XAUTHORITY_MOUNT := $(XAUTHORITY_FILE):/hosthome/.Xauthority:ro
XAUTHORITY := /hosthome/.Xauthority XAUTHORITY := /hosthome/.Xauthority
endif endif
endif endif
...@@ -107,6 +109,7 @@ endif ...@@ -107,6 +109,7 @@ endif
$(DOCKER_COMPOSE_ARGS) docker-compose -f tango.yml up -d $(DOCKER_COMPOSE_ARGS) docker-compose -f tango.yml up -d
start: up ## start a service (usage: make start <servicename>) start: up ## start a service (usage: make start <servicename>)
if [ $(UNAME_S) = Linux ]; then chmod a+r $(XAUTHORITY_FILE); fi
$(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) start $(SERVICE) $(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) start $(SERVICE)
stop: ## stop a service (usage: make stop <servicename>) stop: ## stop a service (usage: make stop <servicename>)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment