Merge pull request #1016 from crawford/docker

app-emulation/docker: add --insecure-registry flag
This commit is contained in:
Alex Crawford 2014-12-17 17:00:34 -08:00
commit 29b476575a
2 changed files with 2 additions and 1 deletions

View File

@ -7,10 +7,11 @@ Requires=docker.socket early-docker.target
[Service] [Service]
Environment=TMPDIR=/var/tmp Environment=TMPDIR=/var/tmp
Environment=DOCKER_DRIVER=btrfs Environment=DOCKER_DRIVER=btrfs
ExecStartPre=/bin/mount --make-rprivate / Environment=DOCKER_OPTS='--insecure-registry="0.0.0.0/0"'
EnvironmentFile=-/run/docker_opts.env EnvironmentFile=-/run/docker_opts.env
LimitNOFILE=1048576 LimitNOFILE=1048576
LimitNPROC=1048576 LimitNPROC=1048576
ExecStartPre=/bin/mount --make-rprivate /
# Run docker but don't have docker automatically restart # Run docker but don't have docker automatically restart
# containers. This is a job for systemd and unit files. # containers. This is a job for systemd and unit files.
ExecStart=/usr/bin/docker --daemon --host=fd:// $DOCKER_OPTS ExecStart=/usr/bin/docker --daemon --host=fd:// $DOCKER_OPTS