From e5d87d4b23e04182f7f8472e29263abaa14f5076 Mon Sep 17 00:00:00 2001
From: Luis San Martin <luis@sanmartin.io>
Date: Sat, 22 May 2021 17:14:13 +0200
Subject: [PATCH 1/2] add support for tun/tap devices

---
 Makefile          |  7 +++++++
 README.md         | 23 ++++++++++++++++++++++-
 debian/Dockerfile |  3 +--
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index e68a65e..3673070 100644
--- a/Makefile
+++ b/Makefile
@@ -93,3 +93,10 @@ clean-docker-images:
 		echo "<noop>";\
 	fi
 
+net:
+	tunctl -t tap0 -u `whoami`
+	brctl addif docker0 tap0
+	ip link set tap0 up
+
+run-debian:
+	qemu-system-x86_64 -drive file=linux.img,index=0,media=disk,format=raw -m 4096 -netdev tap,id=mynet0,ifname=tap0,script=no,downscript=no -device e1000,netdev=mynet0,mac=52:55:00:d1:55:01
diff --git a/README.md b/README.md
index 90d50c3..260624a 100644
--- a/README.md
+++ b/README.md
@@ -41,9 +41,30 @@ Check out `Makefile` for more details or read my article on <a href="https://ixi
 
 - Q: How can I access network from the VM / How can I SSH into the VM?
 
-  A: Networking is not configured at the moment. If you want to configure it yourself, search for TUN/TAP/bridge devices. Don't forget to open a PR if you come up with a working solution.
+  A: Networking is in early stages at the moment. If you want to configure it yourself, search for TUN/TAP/bridge devices.
 
 
+## Network / basic connectivity
+
+You'll need a virtual device (tun/tap) bridged with an interface such as ethernet or docker0.
+
+Follow these steps if you already have docker0:
+
+Create tap interface
+
+    tunctl -t tap0 -u `whoami`
+
+Add tap0 to bridge
+
+    brctl addif docker0 tap0
+    ip link set ens3
+
+Once you've done this you'll need to configure the interface inside the VM. Asumming your network interface is ens3.
+
+    ip addr add 172.17.0.10/16 dev ens3
+    ip link set ens3 up
+    ip route add default via 172.17.0.1
+
 ## Release notes
 #### 2021-05-07
 - Fix - Ubuntu 20.04 stopped working because of the changed path to vmlinuz and initrd files.
diff --git a/debian/Dockerfile b/debian/Dockerfile
index 6b72e4a..3a4a5b9 100644
--- a/debian/Dockerfile
+++ b/debian/Dockerfile
@@ -3,6 +3,5 @@ LABEL com.iximiuz-project="docker-to-linux"
 RUN apt-get -y update
 RUN apt-get -y install --no-install-recommends \
   linux-image-amd64 \
-  systemd-sysv
+  systemd-sysv iproute2 dnsutils vim isc-dhcp-client iputils-ping net-tools
 RUN echo "root:root" | chpasswd
-

From 62c6729c6bd5fe06987cff09f7d94cfe3818cdec Mon Sep 17 00:00:00 2001
From: Luis San Martin <luis@sanmartin.io>
Date: Wed, 26 May 2021 10:25:34 +0200
Subject: [PATCH 2/2] replace brctl for ip

---
 Dockerfile        | 2 +-
 Makefile          | 7 ++++---
 debian/Dockerfile | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9f1af5c..b0a172b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM amd64/debian:bullseye
+FROM amd64/debian:stable
 LABEL com.iximiuz-project="docker-to-linux"
 RUN apt-get -y update
 RUN apt-get -y install extlinux fdisk
diff --git a/Makefile b/Makefile
index 3673070..9559483 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@ COL_GRN="\033[0;32m"
 COL_END="\033[0m"
 
 REPO=docker-to-linux
+BRIDGE=`docker network inspect --format='{{json .Options}}' bridge | python -c 'import json,sys;obj=json.load(sys.stdin);print(obj["com.docker.network.bridge.name"])'`
 
 .PHONY:
 debian: debian.img
@@ -94,9 +95,9 @@ clean-docker-images:
 	fi
 
 net:
-	tunctl -t tap0 -u `whoami`
-	brctl addif docker0 tap0
+	ip tuntap add dev tap0 mod tap
+	ip link set dev tap0 master ${BRIDGE}
 	ip link set tap0 up
 
-run-debian:
+run-qemu-with-net:
 	qemu-system-x86_64 -drive file=linux.img,index=0,media=disk,format=raw -m 4096 -netdev tap,id=mynet0,ifname=tap0,script=no,downscript=no -device e1000,netdev=mynet0,mac=52:55:00:d1:55:01
diff --git a/debian/Dockerfile b/debian/Dockerfile
index 3a4a5b9..23f1941 100644
--- a/debian/Dockerfile
+++ b/debian/Dockerfile
@@ -1,4 +1,4 @@
-FROM amd64/debian:bullseye
+FROM amd64/debian:stable
 LABEL com.iximiuz-project="docker-to-linux"
 RUN apt-get -y update
 RUN apt-get -y install --no-install-recommends \