Browse Source

action update - common job - buildx

crocandr 3 years ago
parent
commit
e444733c77
1 changed files with 17 additions and 17 deletions
  1. 17 17
      .github/workflows/main.yml

+ 17 - 17
.github/workflows/main.yml

@@ -37,22 +37,22 @@ jobs:
             echo "$BASE_URL/$LATEST" | tee latest_url-$FOLDER_STRING.txt
           done
       # Runs a set of commands using the runners shell
-      - name: build container - AMD64
-        env:
-          ARCH: AMD64
-        run: |
-          LATEST_URL=$( cat latest_url-*$ARCH*.txt )
-          echo "Latest URL: $LATEST_URL"
-          [ -z "$LATEST_URL" ] && { echo "Latest url not found"; exit 1; }
-          curl -L -o files/softether.tar.gz "$LATEST_URL"
-          ls -hal files/softether.tar.gz
-          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 )\n\n"
-
-          docker build --rm -t croc/softether -f Dockerfile .
-          docker tag croc/softether croc/softether:$SOFTETHER_VERSION
+#      - name: build container - AMD64
+#        env:
+#          ARCH: AMD64
+#        run: |
+#          LATEST_URL=$( cat latest_url-*$ARCH*.txt )
+#          echo "Latest URL: $LATEST_URL"
+#          [ -z "$LATEST_URL" ] && { echo "Latest url not found"; exit 1; }
+#          curl -L -o files/softether.tar.gz "$LATEST_URL"
+#          ls -hal files/softether.tar.gz
+#          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 )\n\n"
+#
+#          docker build --rm -t croc/softether -f Dockerfile . || { echo "Docker image build fail"; exit 1; }
+#          docker tag croc/softether croc/softether:$SOFTETHER_VERSION
       
       # buildx with quemu
       - name: qemu setup for buildx for arm build
@@ -76,7 +76,7 @@ jobs:
           [ -z "$SOFTETHER_VERSION" ] && { echo "Softether version not defined"; exit 1; }
           echo -e "\n\nDockerfile:\n$( cat Dockerfile )\n\n"
 
-          docker build --rm --platform linux/arm64 -t croc/softether-arm64 -f Dockerfile .
+          docker build buildx --rm --platform linux/arm64 -t croc/softether-arm64 -f Dockerfile . || { echo "Docker image build fail - ARM64"; exit 1; }
           docker tag croc/softether-arm64 croc/softether-arm64:$SOFTETHER_VERSION
 #      - name: push container
 #        env: