From 5f3f04d56f04e41c1ab0f0475e33bd517015db6c Mon Sep 17 00:00:00 2001 From: Nicky Date: Mon, 11 Feb 2019 22:52:02 +0100 Subject: [PATCH] Handle building inside docker. --- indra/newview/viewer_manifest.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 1487da3b8a..e84b16a90b 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -1515,6 +1515,11 @@ class LinuxManifest(ViewerManifest): if snapStage != None: print( "Building flatpak package" ) + if snapStage == None: + data = open( "/proc/1/cgroup", "r" ).readlines()[0] + if "docker" in data: + snapStage = "/usr" + pkgBase = os.path.join(os.pardir, 'packages', 'lib', 'release') if snapStage != None: pkgBase = os.path.join( snapStage, "lib" )