action update - common job - dockerfile fix

.github/workflows/get-latest-url.yml

@@ -1,24 +0,0 @@
-# This is a basic workflow to help you get started with Actions
-
-name: common tasks
-
-# Controls when the workflow will run
-on:
-  workflow_call:
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
-jobs:
-  # reusable workflow
-  get-latest-url:
-    steps:
-      - name: get latest url
-        run: |
-          BASE_URL="https://www.softether-download.com"
-          LATEST_FOLDER=$( curl -s $BASE_URL/files/softether/ | tr ';' '\n' | grep -i href | awk -F'"' '{ print $2 }' | sort -n | tail -n1 )
-          echo "Latest folder is $LATEST_FOLDER"
-          for FOLDER_STRING in "Intel_x64_or_AMD64" "ARM_64bit"
-          do
-            LATEST=$( curl -s "$BASE_URL/$LATEST_FOLDER/Linux/SoftEther_VPN_Server/64bit_-_$FOLDER_STRING/" | tr '<' '\n' | grep -i href | grep -i tar.gz | awk -F '"' '{ print $2 }' ) 
-            echo -e "\nURL for $FOLDER_STRING: " 
-            echo "$BASE_URL/$LATEST" | tee latest_url-$FOLDER_STRING.txt
-          done

.github/workflows/main.yml

@@ -49,9 +49,9 @@ jobs:
           SOFTETHER_VERSION=$( basename $LATEST_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"
+          echo -e "\n\nDockerfile:\n$( cat Dockerfile )\n\n"
 
-          docker build --rm -t croc/softether -f Dockerfile-$ARCH .
+          docker build --rm -t croc/softether -f Dockerfile .
           docker tag croc/softether croc/softether:$SOFTETHER_VERSION
       - name: setup buildx for arm build
         id: buildx
@@ -68,9 +68,9 @@ jobs:
           SOFTETHER_VERSION=$( basename $LATEST_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"
+          echo -e "\n\nDockerfile:\n$( cat Dockerfile )\n\n"
 
-          docker build buildx --rm --platform linux/arm64 -t croc/softether-arm64 -f Dockerfile-$ARCH .
+          docker build buildx --rm --platform linux/arm64 -t croc/softether-arm64 -f Dockerfile .
           docker tag croc/softether-arm64 croc/softether-arm64:$SOFTETHER_VERSION
 #      - name: push container
 #        env: