diff --git a/.dockerignore b/.dockerignore index df34229..4f5f732 100644 --- a/.dockerignore +++ b/.dockerignore @@ -6,7 +6,10 @@ .gitmodules Dockerfile Dockerfile.archive +compose.yml +compose.yaml docker-compose.yml +docker-compose.yaml *.md diff --git a/src/network.sh b/src/network.sh index 11339f0..f1a71c2 100644 --- a/src/network.sh +++ b/src/network.sh @@ -228,9 +228,8 @@ getInfo() { if [ -z "$VM_NET_MAC" ]; then local file="$STORAGE/dsm.mac" - if [ -f "$file" ]; then - VM_NET_MAC=$(<"$file") - else + [ -f "$file" ] && VM_NET_MAC=$(<"$file") + if [ -z "$VM_NET_MAC" ]; then # Generate MAC address based on Docker container ID in hostname VM_NET_MAC=$(echo "$HOST" | md5sum | sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:11:32:\3:\4:\5/') echo "${VM_NET_MAC^^}" > "$file"