Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
T
tango
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira issues
Open Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
LOFAR2.0
tango
Commits
c6f436a6
Commit
c6f436a6
authored
4 years ago
by
Thomas Juerges
Browse files
Options
Downloads
Patches
Plain Diff
Add automatic chmod a+r ~/.Xauthority on Linux
parent
f153dcef
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
docker-compose/Makefile
+5
-2
5 additions, 2 deletions
docker-compose/Makefile
with
5 additions
and
2 deletions
docker-compose/Makefile
+
5
−
2
View file @
c6f436a6
...
@@ -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>)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment