more fixes for build

.github/workflows/main.yml

@@ -46,20 +46,21 @@ jobs:
             LATEST_URL=$( cat latest_url-*$ARCH*.txt );
             echo "Latest URL: $LATEST_URL"
             [ -z "$LATEST_URL" ] && { echo "Latest url not found"; exit 1; }
-            sed -i "s@ENV.*DOWNLOAD_URL.*@ENV DOWNLOAD_URL $LATEST_URL@g" Dockerfile-$ARCH 
-            echo "--- Dockerfile for $ARCH ---"  cat Dockerfile-$ARCH  echo "-------------------------"
+            sed -i "s@ENV.*DOWNLOAD_URL.*@ENV DOWNLOAD_URL $LATEST_URL@g" Dockerfile-$ARCH
             VERSION_DOWNLOAD_URL=$( grep DOWNLOAD_URL Dockerfile-$ARCH | awk '{ print $3 }' ) 
-            SOFTETHER_VERSION=$( basename $VERSION_DOWNLOAD_URL | sed "s@softether-vpnserver-@@g" | cut -f1-3 -d'-' )  echo "Softether version is $SOFTETHER_VERSION" 
-            cat Dockerfile-$ARCH
+            SOFTETHER_VERSION=$( basename $VERSION_DOWNLOAD_URL | sed "s@softether-vpnserver-@@g" | cut -f1-3 -d'-' )
+            echo "Softether version: $SOFTETHER_VERSION"
+            [ -z "$SOFTETHER_VERSION" ] && { echo "Softether version not defined"; exit 1; }
+            echo -e "\n\nDockerfile:\n$( cat Dockerfile-$ARCH )\n\n"
             case $ARCH in
               "ARM" )
                 echo "  Using docker buildx method ..." 
-                docker buildx build --rm --platform linux/arm64 -t croc/softether-arm64 -f Dockerfile-$ARCH $SRC_DIR 
+                docker buildx build --rm --platform linux/arm64 -t croc/softether-arm64 -f Dockerfile-$ARCH . 
                 docker tag croc/softether croc/softether-arm64:$SOFTETHER_VERSION
                 ;;
               * )
                 echo "  Using normal docker build method ..." 
-                docker build -t croc/softether -f Dockerfile-$ARCH $SRC_DIR 
+                docker build -t croc/softether -f Dockerfile-$ARCH .
                 docker tag croc/softether croc/softether:$SOFTETHER_VERSION
                 ;;
             esac