Skip to content

Commit 0868432

Browse files
Matthew Fishercarmstrong
authored andcommitted
fix(contrib): add --insecure-registry flag for docker 1.3.2
Deis' registry is insecure. Docker is secure-by-default, which means that we must now whitelist insecure registries on each and every daemon.
1 parent fbb7b35 commit 0868432

2 files changed

Lines changed: 9 additions & 0 deletions

File tree

contrib/coreos/user-data.example

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ write_files:
5353
function nse() {
5454
docker exec -it $1 bash
5555
}
56+
- path: /etc/systemd/system/docker.service.d/50-insecure-registry.conf
57+
content: |
58+
[Service]
59+
Environment=DOCKER_OPTS='--insecure-registry="10.0.0.0/8"'
5660
- path: /run/deis/bin/get_image
5761
permissions: '0755'
5862
content: |

docs/contributing/hacking.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,11 @@ Make sure it meets the following requirements:
103103
#. You can push Docker images from your workstation
104104
#. Hosts in the cluster can pull images with the same URL
105105

106+
.. note::
107+
108+
If the development registry is insecure, you'll have to modify contrib/coreos/user-data.example
109+
and whitelist your development registry so the daemons can pull your custom components.
110+
106111
Development Workflow
107112
--------------------
108113

0 commit comments

Comments
 (0)