From c8e4bd07169d7484feb5b6863f824ee2ae43512c Mon Sep 17 00:00:00 2001
From: KemoNine <kemonine@lollipopcloud.solutions>
Date: Wed, 8 Aug 2018 11:32:13 -0400
Subject: [PATCH] Update docker related docs (add labels, remove registry for
 now)

---
 armbian/docker.md          | 10 ++++++++--
 armbian/docker_registry.md | 36 ------------------------------------
 2 files changed, 8 insertions(+), 38 deletions(-)
 delete mode 100644 armbian/docker_registry.md

diff --git a/armbian/docker.md b/armbian/docker.md
index 7b31d87..c1284fa 100644
--- a/armbian/docker.md
+++ b/armbian/docker.md
@@ -72,11 +72,17 @@ For the containers detailed here, you'll want a dedicated directory for keeping
 
 Ensure the default Docker bridge doesn't conflict with existing networks.
 
+*Note: replace arm64 with arm32 in the below if using an arm32 board*
+
 ``` bash
 
 cat >> /etc/docker/daemon.json <<EOF
 {
-  "bip": "10.30.0.1/16"
+  "bip": "10.30.0.1/16",
+  "labels": [
+    "os=linux",
+    "arch=arm64"
+  ]
 }
 EOF
 systemctl restart docker
@@ -102,4 +108,4 @@ nmcli connection modify [uuid] connection.zone trusted
 systemctl restart NetworkManager docker firewalld
 firewall-cmd --info-zone trusted
 
-```
\ No newline at end of file
+```
diff --git a/armbian/docker_registry.md b/armbian/docker_registry.md
deleted file mode 100644
index d05b577..0000000
--- a/armbian/docker_registry.md
+++ /dev/null
@@ -1,36 +0,0 @@
-https://github.com/docker/distribution
-https://github.com/docker/docker.github.io/blob/master/registry/deploying.md
-https://stackoverflow.com/questions/24309526/how-to-change-the-docker-image-installation-directory
-
-Prereq : Docker installed
-
-Prereq : Docker config
-
-/etc/docker/daemon.json
-graph: /tank/docker/graph
-
-docker info | grep "Docker Root Dir"
-
-docker pull ubuntu:16.04 # pull from hub
-docker tag ubuntu:16.04 localhost:5000/my-ubuntu # tag for registry
-docker push localhost:5000/my-ubuntu # push to registry
-docker image remove ubuntu:16.04 # nuke local cache
-docker image remove localhost:5000/my-ubuntu # nuke local cached
-docker pull localhost:5000/my-ubuntu # pull from registry
-
-
-docker run --name registry \
-  --restart unless-stopped \\
-  -p 5000:5000 \
-  -e TZ=UTC \\
-  -e DEBUG=1 \\
-  -e REGISTRY_HTTP_ADDR=0.0.0.0:5000 \
-  -e REGISTRY_HTTP_TLS_CERTIFICATE=/certs/domain.crt \
-  -e REGISTRY_HTTP_TLS_KEY=/certs/domain.key \
-  -e REGISTRY_AUTH=htpasswd \
-  -e REGISTRY_AUTH_HTPASSWD_REALM="Registry Realm" \
-  -e REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd \
-  -v /path/data:/var/lib/registry
-  -v /path/certs:/certs
-  -v /path/auth:/auth
-  registry/registry:$tag