Unverified Commit 3dc8f243 authored by Kroese's avatar Kroese Committed by GitHub
Browse files

Added option for DHCP

parents a36111e8 406b97dc

.github/workflows/check.yml

+1 −1
Original line number Diff line number Diff line 
on: [workflow_call]

name: "Check"

name: "Shellcheck"

permissions: {}



jobs:

Dockerfile

+4 −3
Original line number Diff line number Diff line
@@ -17,15 +17,16 @@ RUN apt-get update && apt-get -y upgrade && \ 
	fdisk \

	unzip \

	procps \

	dnsmasq \

	xz-utils \

	iptables \

	iproute2 \

	xz-utils \

	dnsmasq \

	net-tools \

	btrfs-progs \

	bridge-utils \

	netcat-openbsd \

	ca-certificates \

	isc-dhcp-client \

	netcat-openbsd \

	qemu-system-x86 \

    && apt-get clean

agent/agent.sh

+11 −3
Original line number Diff line number Diff line
@@ -134,9 +134,17 @@ fi 


# Display message in docker log output



echo "-------------------------------------------"

echo " You can now login to DSM at port 5000     "

echo "-------------------------------------------"

IP=$(ip address show dev eth0 | grep inet | awk '/inet / { print $2 }' | cut -f1 -d/)



if [[ "$IP" == "20.20"* ]]; then

  MSG="port 5000"

else

  MSG="http://${IP}:5000"

fi



echo "--------------------------------------------------------"

echo " You can now login to DSM at ${MSG}"

echo "--------------------------------------------------------"



# Wait for NMI interrupt as a shutdown signal

readme.md

+14 −2
Original line number Diff line number Diff line
@@ -128,10 +128,22 @@ docker run -it --rm -p 5000:5000 --device=/dev/kvm --cap-add NET_ADMIN --stop-ti 
        --ip-range=192.168.0.100/28 \

        -o parent=eth0 vdsm

    ```

    Modify these values to match your local subnet. And change the docker network of the container from `bridged` to `vdsm` in your run command or compose file:

    Modify these values to match your local subnet. 



    Now change the containers configuration in your compose file:



    ```

    networks:

        vdsm:             

            ipv4_address: 192.168.0.100

    ```



    And add the network to the very bottom of your compose file:



    ```

     --network vdsm --ip=192.168.0.100

    networks:

        vdsm:

            external: true

    ```



    This also has the advantage that you don't need to do any portmapping anymore, because all ports will be fully exposed this way.

run/disk.sh

+3 −3
Original line number Diff line number Diff line
@@ -3,9 +3,9 @@ set -eu 


# Docker environment variabeles



: ${DISK_IO:='native'}          # I/O Mode

: ${DISK_ROTATION:='1'}    # Rotation rate

: ${DISK_CACHE:='none'}   # Caching mode

: ${DISK_IO:='native'}          # I/O Mode, can be set to 'native', 'threads' or 'io_turing' 

: ${DISK_ROTATION:='1'}    # Rotation rate, set to 1 for SSD storage and increase for HDD

: ${DISK_CACHE:='none'}   # Caching mode, can be set to 'writeback' for better performance



BOOT="$STORAGE/$BASE.boot.img"

SYSTEM="$STORAGE/$BASE.system.img"