[buildx] fix buildx plugin installation

tsirysndr · Sep 14, 2024 · 1c55015 · 1c55015
1 parent 3d49ef4
commit 1c55015
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/buildx/dagger.json b/buildx/dagger.json
@@ -1,7 +1,7 @@
 {
   "name": "buildx",
   "sdk": "github.com/fluentci-io/daggerverse/deno-sdk@main",
-  "version": "v0.1.2",
+  "version": "v0.1.3",
   "description": "",
   "author": "Tsiry Sandratraina",
   "license": "MIT"

diff --git a/buildx/plugin/Cargo.toml b/buildx/plugin/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 edition = "2021"
 name = "buildx"
-version = "0.1.2"
+version = "0.1.3"
 
 [lib]
 crate-type = ["cdylib"]

diff --git a/buildx/plugin/src/lib.rs b/buildx/plugin/src/lib.rs
@@ -29,14 +29,14 @@ pub fn build(args: String) -> FnResult<String> {
         .with_exec(vec!["pkgx", "install", "docker", "wget"])?
         .with_exec(vec![&format!(
             r#"
-          if [ ! -f $HOME/.docker/cli-plugins/{} ]; then
+          if [ ! -f $HOME/.docker/cli-plugins/docker-buildx ]; then
             wget {};
             chmod +x {};
             mkdir -p $HOME/.docker/cli-plugins;
-            mv {} $HOME/.docker/cli-plugins;
+            mv {} $HOME/.docker/cli-plugins/docker-buildx;
           fi
         "#,
-            buildx_plugin, buildx_download_url, buildx_plugin, buildx_plugin
+            buildx_download_url, buildx_plugin, buildx_plugin
         )])?
         .with_exec(vec!["docker buildx rm builder || true"])?
         .with_exec(vec![
@@ -78,14 +78,14 @@ pub fn build_cloud(args: String) -> FnResult<String> {
         .with_exec(vec!["pkgx", "install", "docker", "wget"])?
         .with_exec(vec![&format!(
             r#"
-          if [ ! -f $HOME/.docker/cli-plugins/{} ]; then
+          if [ ! -f $HOME/.docker/cli-plugins/docker-buildx ]; then
             wget {};
             chmod +x {};
             mkdir -p $HOME/.docker/cli-plugins;
-            mv {} $HOME/.docker/cli-plugins;
+            mv {} $HOME/.docker/cli-plugins/docker-buildx;
           fi
         "#,
-            buildx_plugin, buildx_download_url, buildx_plugin, buildx_plugin
+            buildx_download_url, buildx_plugin, buildx_plugin
         )])?
         .with_exec(vec![&format!(
             "docker buildx create --driver cloud {} || true",