Mercurial > sat_docs
comparison docker/base/Dockerfile @ 97:6e6274aa3916
docker (base): fixed arguments handling in dbus_wrap
author | Goffi <goffi@goffi.org> |
---|---|
date | Fri, 26 Feb 2016 11:33:35 +0100 (2016-02-26) |
parents | eeff161a19e8 |
children | b69056368901 |
comparison
equal
deleted
inserted
replaced
96:c425b8a99a29 | 97:6e6274aa3916 |
---|---|
163 # we need a TCP socket | 163 # we need a TCP socket |
164 RUN sed -i "s&<listen>unix:tmpdir=/tmp</listen>&\0\n <listen>tcp:host=localhost,bind=*,port=55555,family=ipv4</listen>\n <auth>ANONYMOUS</auth>\n <allow_anonymous/>&" /etc/dbus-1/session.conf | 164 RUN sed -i "s&<listen>unix:tmpdir=/tmp</listen>&\0\n <listen>tcp:host=localhost,bind=*,port=55555,family=ipv4</listen>\n <auth>ANONYMOUS</auth>\n <allow_anonymous/>&" /etc/dbus-1/session.conf |
165 | 165 |
166 # this script will launch the command with good D-BUS parameters | 166 # this script will launch the command with good D-BUS parameters |
167 # it needs to be copied and made executable by frontends | 167 # it needs to be copied and made executable by frontends |
168 RUN echo "#!/bin/sh\nexport DBUS_SESSION_BUS_ADDRESS=tcp:host=sat,port=55555,family=ipv4\nexec /usr/bin/\$(basename \$0) \$@" > /usr/local/bin/dbus_wrap | 168 RUN echo '#!/bin/sh\nexport DBUS_SESSION_BUS_ADDRESS=tcp:host=sat,port=55555,family=ipv4\nexec /usr/bin/$(basename "$0") "$@"' > /usr/local/bin/dbus_wrap |
169 | 169 |
170 ########## | 170 ########## |
171 # LAUNCH # | 171 # LAUNCH # |
172 ########## | 172 ########## |
173 | 173 |