Merge pull request #4 from MeneDev/multi-arch

Multi arch
MeneDev · May 9, 2024 · 6b53c8b · 6b53c8b
2 parents deed5ed + 6a9c110
commit 6b53c8b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/publish-chart.yaml b/.github/workflows/publish-chart.yaml
@@ -43,7 +43,7 @@ jobs:
             docker tag csi-rclone:latest $DOCKER_REPOSITORY:latest-amd64
             docker tag csi-rclone:latest $DOCKER_REPOSITORY:${TAG}-amd64
             
-            echo ${DOCKER_PASSWORD}|docker login -u ${DOCKER_USERNAME} --password-stdin
+            echo "${DOCKER_PASSWORD}" | docker login -u ${DOCKER_USERNAME} --password-stdin
 
             docker push $DOCKER_REPOSITORY:latest-aarch64
             docker push $DOCKER_REPOSITORY:${TAG}-aarch64
@@ -59,8 +59,8 @@ jobs:
               --amend $DOCKER_REPOSITORY:${TAG}-amd64 \
               --amend $DOCKER_REPOSITORY:${TAG}-aarch64
             
-            docker push $DOCKER_REPOSITORY:latest
-            docker push $DOCKER_REPOSITORY:${TAG}
+            docker manifest push $DOCKER_REPOSITORY:latest
+            docker manifest push $DOCKER_REPOSITORY:${TAG}
 
       - name: Publish chart
         env:

diff --git a/devenv/nix/containerImage.nix b/devenv/nix/containerImage.nix
@@ -20,5 +20,6 @@ pkgs.dockerTools.streamLayeredImage {
   extraCommands = ''
     mkdir -p ./plugin
     mkdir -p ./tmp
+    ln /bin/linux_*/csi-rclone-plugin /bin/csi-rclone-plugin
   '';
 }