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 1666e9e..7c02760 100644 --- a/src/network.sh +++ b/src/network.sh @@ -251,9 +251,8 @@ getInfo() { if [ -z "$MAC" ]; then local file="$STORAGE/$PROCESS.mac" - if [ -f "$file" ]; then - MAC=$(<"$file") - else + [ -f "$file" ] && MAC=$(<"$file") + if [ -z "$MAC" ]; then # Generate MAC address based on Docker container ID in hostname MAC=$(echo "$HOST" | md5sum | sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:\1:\2:\3:\4:\5/') echo "${MAC^^}" > "$file"