tweaks

.github/workflows/docker-dev.yml

@@ -5,11 +5,36 @@ on:
     branches: [ develop ]
 
 jobs:
-  build:
+  build-amd64:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        architecture: [amd64, arm64]
+        architecture: [amd64]
+    steps:
+    - name: Login to DockerHub
+      uses: docker/login-action@v2
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+    - name: Checkout
+      uses: actions/checkout@v3
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: crazy-max/ghaction-docker-buildx@v3
+      with:
+        buildx-version: latest
+        qemu-version: latest
+    - name: Available platforms
+      run: echo ${{ steps.buildx.outputs.platforms }}
+    - name: Run Buildx
+      run: docker buildx build --platform linux/${{matrix.architecture}} -t kerberos/agent-dev:arch-${{matrix.architecture}}-$(echo $GITHUB_SHA | cut -c1-7) --push . 
+    - name: Create new and append to manifest
+      run: docker buildx imagetools create -t kerberos/agent-dev:$(echo $GITHUB_SHA | cut -c1-7) kerberos/agent-dev:arch-${{matrix.architecture}}-$(echo $GITHUB_SHA | cut -c1-7)
+  build-other:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        architecture: [arm64]
     steps:
     - name: Login to DockerHub
       uses: docker/login-action@v2

.github/workflows/docker-nightly.yml

@@ -6,11 +6,36 @@ on:
     - cron: "0 21 * * *"
 
 jobs:
-  build:
+  build-amd64:
+      runs-on: ubuntu-latest
+      strategy:
+        matrix:
+          architecture: [amd64]
+      steps:
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: crazy-max/ghaction-docker-buildx@v3
+        with:
+          buildx-version: latest
+          qemu-version: latest
+      - name: Available platforms
+        run: echo ${{ steps.buildx.outputs.platforms }}
+      - name: Run Buildx
+        run: docker buildx build --platform linux/${{matrix.architecture}} -t kerberos/agent-nightly:arch-${{matrix.architecture}}-$(echo $GITHUB_SHA | cut -c1-7) --push . 
+      - name: Create new and append to manifest
+        run: docker buildx imagetools create -t kerberos/agent-nightly:$(echo $GITHUB_SHA | cut -c1-7) kerberos/agent-nightly:arch-${{matrix.architecture}}-$(echo $GITHUB_SHA | cut -c1-7)
+  build-other:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        architecture: [amd64, arm64]
+        architecture: [arm64]
     steps:
     - name: Login to DockerHub
       uses: docker/login-action@v2

.github/workflows/docker.yml

@@ -5,11 +5,36 @@ on:
     branches: [ master ]
 
 jobs:
-  build:
+  build-amd64:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        architecture: [amd64, arm64, armv7, armv6]
+        architecture: [amd64]
+    steps:
+    - name: Login to DockerHub
+      uses: docker/login-action@v2
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+    - name: Checkout
+      uses: actions/checkout@v3
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: crazy-max/ghaction-docker-buildx@v3
+      with:
+        buildx-version: latest
+        qemu-version: latest
+    - name: Available platforms
+      run: echo ${{ steps.buildx.outputs.platforms }}
+    - name: Run Buildx
+      run: docker buildx build --platform linux/${{matrix.architecture}} -t kerberos/agent:arch-${{matrix.architecture}}-$(echo $GITHUB_SHA | cut -c1-7) --push . 
+    - name: Create new and append to manifest
+      run: docker buildx imagetools create -t kerberos/agent:$(echo $GITHUB_SHA | cut -c1-7) kerberos/agent:arch-${{matrix.architecture}}-$(echo $GITHUB_SHA | cut -c1-7)
+  build-other:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        architecture: [arm64, armv7, armv6]
     steps:
     - name: Login to DockerHub
       uses: docker/login-action@v2

Dockerfile

@@ -57,7 +57,8 @@ RUN cp -r /agent ./
 
 RUN ldd /agent/main | tr -s '[:blank:]' '\n' | grep '^/' | \
 	xargs -I % sh -c 'mkdir -p $(dirname ./%); cp % ./%;'
-#RUN mkdir -p lib64 && cp /lib64/ld-linux-x86-64.so.2 lib64/
+RUN mkdir -p lib64 && cp /lib64/ld-linux-x86-64.so.2 lib64/ 2> /dev/null
+RUN mkdir -p lib && cp /lib/ld-linux-aarch64.so.1 lib/ 2> /dev/null 
 RUN mkdir -p ./usr/lib
 RUN cp -r /usr/local/lib/libavcodec* ./usr/lib && \
 	cp -r /usr/local/lib/libavformat* ./usr/lib && \