ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-04-24 13:05:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1138 from balena-io/dindctl-fix

Browse Source 
dindctl fixes
This commit is contained in:
Page- 2019-11-12 11:47:35 +00:00 committed by GitHub
commit 405bd4a2f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -130,7 +130,7 @@ run-supervisor: supervisor-dind
cd tools/dind \
&& ./resinos-in-container/resinos-in-container.sh \
--detach \
--config "$$(pwd)/$(CONFIG_FILENAME)" \
--config "$(CONFIG_FILENAME)" \
--image $(DIND_IMAGE) \
--id $(CONTAINER_NAME) \
--extra-args "${SUPERVISOR_DIND_MOUNTS}"

6
dindctl
View File

@ -107,7 +107,7 @@ function parseOptions {
CLEAN_VOLUMES="false"
;;
*)
echo "Warning: unknown argument: $arg"
echo "Warning: unknown argument: $1"
;;
esac
shift
@ -136,8 +136,8 @@ function refreshSupervisorSrc {
}
function runDind {
if [ ! -f "tools/dind/resinos-in-container/resinos-in-container.sh" ]; then
git submodule update --init
if [ ! -f "$SUPERVISOR_BASE_DIR/tools/dind/resinos-in-container/resinos-in-container.sh" ]; then
(cd $SUPERVISOR_BASE_DIR; git submodule update --init)
fi
if [ "$MOUNT_DIST" = "true" ]; then
buildSupervisorSrc