Merge pull request nicolaka#74 from nicolaka/test

automating build and push with Github Actions to support arm64 and x86

Author: nicolaka

.github/workflows/docker-buildx.yml

@@ -24,10 +24,22 @@ jobs:
       -
         name: Available platforms
         run: echo ${{ steps.buildx.outputs.platforms }}
+      - 
+        name: docker login
+        env:
+          DOCKER_USER: ${{secrets.DOCKER_USER}}
+          DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}}
+        run: |
+            docker login -u $DOCKER_USER -p $DOCKER_PASSWORD 
       -
         name: Run Buildx
         run: |
           docker buildx build \
             --platform linux/amd64,linux/arm64 \
-            --output "type=image,push=false" \
-            --file ./Dockerfile .
+            --output "type=image,push=true" \
+            --file ./Dockerfile \
+            --tag $GITHUB_REPOSITORY:$GITHUB_SHA \
+            --tag $GITHUB_REPOSITORY:latest . 
+
+
+            

Dockerfile

@@ -52,6 +52,7 @@ RUN set -ex \
     py3-setuptools \
     scapy \
     socat \
+    speedtest-cli \
     strace \
     tcpdump \
     tcptraceroute \

Makefile

@@ -0,0 +1,21 @@
+.PHONY: build-x86 build-arm64 push all
+
+# Build Vars
+IMAGENAME=nicolaka/netshoot
+VERSION=0.1
+
+
+.DEFAULT_GOAL := all
+
+build-x86:
+	    @docker build --platform linux/amd64 -t ${IMAGENAME}:${VERSION} .
+build-arm64:
+		@docker build --platform linux/arm64 -t ${IMAGENAME}:${VERSION} .
+build-all:
+		@docker buildx build --platform linux/amd64,linux/arm64 --output "type=image,push=false" --file ./Dockerfile .
+push:
+	 	@docker push ${IMAGENAME}:${VERSION} 
+all: build-all push
+
+
+