Commit e00adbfe authored by Kroese's avatar Kroese Committed by GitHub
Browse files

IP routing 

IP routing
parents 0cd14dc2 80f7dc5b

Dockerfile

+1 −2
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ VOLUME /storage 
EXPOSE 22

EXPOSE 80

EXPOSE 139 

EXPOSE 443 

EXPOSE 445

EXPOSE 5000
@@ -66,6 +65,6 @@ LABEL org.opencontainers.image.version=${VERSION_ARG} 
LABEL org.opencontainers.image.source=https://github.com/kroese/virtual-dsm/

LABEL org.opencontainers.image.url=https://hub.docker.com/r/kroese/virtual-dsm/



HEALTHCHECK --interval=30s --retries=2 CMD /run/check.sh

HEALTHCHECK --interval=60s --retries=2 CMD /run/check.sh



ENTRYPOINT ["/run/run.sh"]

run/network.sh

+8 −9
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ configureDHCP() { 
  IP=$(ip address show dev "${VM_NET_DEV}" | grep inet | awk '/inet / { print $2 }' | cut -f1 -d/)



  [[ "${DEBUG}" == [Yy1]* ]] && set -x



  # Create a macvlan network to allow for communication between the host and the VM guest

  { ip link add link "${VM_NET_DEV}" "${VM_NET_VLAN}" type macvlan mode bridge ; rc=$?; } || :



  if (( rc != 0 )); then
@@ -44,6 +46,7 @@ configureDHCP() { 
  ip route add "${NETWORK}" dev "${VM_NET_VLAN}" metric 0

  ip route add default via "${GATEWAY}"

  

  # Create a macvtap network for the VM guest

  { ip link add link "${VM_NET_DEV}" name "${VM_NET_TAP}" address "${VM_NET_MAC}" type macvtap mode bridge ; rc=$?; } || :



  if (( rc != 0 )); then
@@ -53,9 +56,6 @@ configureDHCP() { 


  ip link set "${VM_NET_TAP}" up



  ip address flush "${VM_NET_DEV}"

  ip address flush "${VM_NET_TAP}"



  { set +x; } 2>/dev/null



  TAP_NR=$(</sys/class/net/"${VM_NET_TAP}"/ifindex)
@@ -98,7 +98,6 @@ configureNAT () { 
  [[ "${DEBUG}" == [Yy1]* ]] && set -x



  # Create bridge with static IP for the VM guest



  { ip link add dev dockerbridge type bridge ; rc=$?; } || :



  if (( rc != 0 )); then