ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2024-12-27 01:11:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make resolv.conf writable from a User container

Browse Source
This commit is contained in:
Praneeth Bodduluri 2015-07-22 03:39:59 +05:30 committed by Pablo Carranza Vélez
parent b8ecdb3ce2
commit 418d838dec
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -1,3 +1,4 @@
* Make resolv.conf writable from a user container. [Praneeth]
* Updated pubnub (3.7.13 doesn't seem to have the heartbeat unnecessarily) * Updated pubnub (3.7.13 doesn't seem to have the heartbeat unnecessarily)
* Fixed an issue where an image would not be cleaned up if it was tagged in multiple repos. [Page] * Fixed an issue where an image would not be cleaned up if it was tagged in multiple repos. [Page]
* Use JOBS=MAX for npm install. [Page] * Use JOBS=MAX for npm install. [Page]

2
src/application.coffee
View File

@ -207,7 +207,7 @@ exports.start = start = (app) ->
'/lib/modules:/lib/modules' '/lib/modules:/lib/modules'
'/run/dbus:/run/dbus' '/run/dbus:/run/dbus'
'/var/run/docker.sock:/run/docker.sock' '/var/run/docker.sock:/run/docker.sock'
'/etc/resolv.conf:/etc/resolv.conf:ro' '/etc/resolv.conf:/etc/resolv.conf:rw'
] ]
) )
.catch (err) -> .catch (err) ->

2
src/config.coffee
View File

@ -37,5 +37,5 @@ config.supervisorContainer =
'/resin-data/resin-supervisor:/data' '/resin-data/resin-supervisor:/data'
'/proc/net/fib_trie:/mnt/fib_trie' '/proc/net/fib_trie:/mnt/fib_trie'
'/var/log/supervisor-log:/var/log' '/var/log/supervisor-log:/var/log'
'/etc/resolv.conf:/etc/resolv.conf:ro' '/etc/resolv.conf:/etc/resolv.conf:rw'
] ]

2
tools/dind/config/services/resin-supervisor-dind.service
View File

@ -19,7 +19,7 @@ ExecStart=/usr/bin/docker run --rm --privileged --name resin_supervisor \
-v /proc/net/fib_trie:/mnt/fib_trie \ -v /proc/net/fib_trie:/mnt/fib_trie \
-v /var/log/supervisor-log:/var/log \ -v /var/log/supervisor-log:/var/log \
-v /:/mnt/root \ -v /:/mnt/root \
-v /etc/resolv.conf:/etc/resolv.conf:ro \ -v /etc/resolv.conf:/etc/resolv.conf:rw \
-e "API_ENDPOINT=${API_ENDPOINT}" \ -e "API_ENDPOINT=${API_ENDPOINT}" \
-e "REGISTRY_ENDPOINT=${REGISTRY_ENDPOINT}" \ -e "REGISTRY_ENDPOINT=${REGISTRY_ENDPOINT}" \
-e "PUBNUB_SUBSCRIBE_KEY=${PUBNUB_SUBSCRIBE_KEY}" \ -e "PUBNUB_SUBSCRIBE_KEY=${PUBNUB_SUBSCRIBE_KEY}" \