Skip to content

Commit 840f2fc

Browse files
author
Matthew Fisher
committed
fix(controller): remove docker engine
The intention of the docker engine was such that we could use it to pull in an image from a registry and push it to our own. Now that we have registry transfers, this is no longer required.
1 parent 03384a7 commit 840f2fc

3 files changed

Lines changed: 0 additions & 101 deletions

File tree

controller/bin/boot

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,18 +47,6 @@ while grep -q '<no value>' /templates/confd_settings.py; do
4747
sleep $(($ETCD_TTL/2)) # sleep for half the TTL
4848
done
4949

50-
# remove any pre-existing docker.sock
51-
test -e /var/run/docker.sock && rm -f /var/run/docker.sock
52-
53-
# spawn a docker daemon to run builds
54-
docker -d --storage-driver=btrfs --bip=172.20.42.1/16 &
55-
DOCKER_PID=$!
56-
57-
# wait for docker to start
58-
while [[ ! -e /var/run/docker.sock ]]; do
59-
sleep 1
60-
done
61-
6250
cd /app
6351

6452
# run an idempotent database migration

controller/bin/entry

Lines changed: 0 additions & 88 deletions
This file was deleted.

controller/deis/settings.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,6 @@
278278

279279
# registry settings
280280
REGISTRY_MODULE = 'registry.mock'
281-
REGISTRY_URL = None
282281
REGISTRY_HOST = 'localhost'
283282
REGISTRY_PORT = 5000
284283

0 commit comments

Comments
 (0)