Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
VideoLAN
docker-images
Commits
f967d2f5
Commit
f967d2f5
authored
Jul 28, 2016
by
Konstantin Pavlov
Browse files
Fix dind image.
parent
b0181182
Changes
2
Hide whitespace changes
Inline
Side-by-side
videolan-base/dind/Dockerfile
View file @
f967d2f5
...
...
@@ -10,7 +10,11 @@ RUN apk add --no-cache \
iptables
\
xfsprogs
\
xz
\
openssh
openssh
\
bash
\
openjdk8-jre-base
\
git
\
make
# TODO aufs-tools
...
...
videolan-base/dind/dockerd-entrypoint.sh
View file @
f967d2f5
#!/bin/sh
set
-ex
ssh-keygen
-A
/usr/sbin/sshd
-e
if
[
"$#"
-eq
0
-o
"
${
1
:0:1
}
"
=
'-'
]
;
then
set
--
docker daemon
\
dind docker daemon
\
--host
=
unix:///var/run/docker.sock
\
--host
=
tcp://0.0.0.0:2375
\
--storage-driver
=
vfs
\
"
$@
"
fi
--storage-driver
=
vfs &
if
[
"
$1
"
=
'docker'
-a
"
$2
"
=
'daemon'
]
;
then
# if we're running Docker, let's pipe through dind
# (and we'll run dind explicitly with "sh" since its shebang is /bin/bash)
set
--
sh
"
$(
which dind
)
"
"
$@
"
fi
ssh-keygen
-A
exec
"
$@
"
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment