feat: remove gearman / mysql binaries

Jumbleberry · Jan 22, 2024 · 699e4f1 · 699e4f1
1 parent 793f5c3
commit 699e4f1
Show file tree

Hide file tree

Showing 16 changed files with 8 additions and 5 deletions.
diff --git a/base/files/gearman/libboost-program-options1.71.0_1.71.0-6ubuntu6_amd64.deb b/base/files/gearman/libboost-program-options1.71.0_1.71.0-6ubuntu6_amd64.deb
diff --git a/base/files/gearman/libboost-program-options1.71.0_1.71.0-6ubuntu6_arm64.deb b/base/files/gearman/libboost-program-options1.71.0_1.71.0-6ubuntu6_arm64.deb
diff --git a/base/files/mysql/libevent-core-2.1-6_amd64.deb b/base/files/mysql/libevent-core-2.1-6_amd64.deb
diff --git a/base/files/mysql/libevent-core-2.1-6_arm64.deb b/base/files/mysql/libevent-core-2.1-6_arm64.deb
diff --git a/base/files/mysql/libssl1.1_1.1.1f_amd64.deb b/base/files/mysql/libssl1.1_1.1.1f_amd64.deb
diff --git a/base/files/mysql/libssl1.1_1.1.1f_arm64.deb b/base/files/mysql/libssl1.1_1.1.1f_arm64.deb
diff --git a/base/files/mysql/mysql-client-5.7.42_amd64.deb b/base/files/mysql/mysql-client-5.7.42_amd64.deb
diff --git a/base/files/mysql/mysql-client-5.7.42_arm64.deb b/base/files/mysql/mysql-client-5.7.42_arm64.deb
diff --git a/base/files/mysql/mysql-client-core-5.7.42_amd64.deb b/base/files/mysql/mysql-client-core-5.7.42_amd64.deb
diff --git a/base/files/mysql/mysql-client-core-5.7.42_arm64.deb b/base/files/mysql/mysql-client-core-5.7.42_arm64.deb
diff --git a/base/files/mysql/mysql-server-5.7.42_amd64.deb b/base/files/mysql/mysql-server-5.7.42_amd64.deb
diff --git a/base/files/mysql/mysql-server-5.7.42_arm64.deb b/base/files/mysql/mysql-server-5.7.42_arm64.deb
diff --git a/base/files/mysql/mysql-server-core-5.7.42_amd64.deb b/base/files/mysql/mysql-server-core-5.7.42_amd64.deb
diff --git a/base/files/mysql/mysql-server-core-5.7.42_arm64.deb b/base/files/mysql/mysql-server-core-5.7.42_arm64.deb
diff --git a/base/recipes/gearman.rb b/base/recipes/gearman.rb
@@ -6,13 +6,14 @@
   retries 5
 end
 
-cookbook_files = "#{Chef::Config[:file_cache_path]}/cookbooks/#{cookbook_name}/files/gearman"
 arch = case node["kernel"]["machine"]
   when "aarch64", "arm64" then "arm64"
   else "amd64"
   end
+boost_deb = "libboost-program-options1.71.0_1.71.0-6ubuntu6_#{arch}.deb"
 
-execute "dpkg -i #{cookbook_files}/libboost-program-options1.71.0_1.71.0-6ubuntu6_#{arch}.deb;" do
+execute "curl -sLO https://miscfile-staging.s3.amazonaws.com/chef/base/gearman/#{boost_deb} && dpkg -i #{boost_deb};" do
+  cwd "/tmp"
   only_if { node["lsb"]["release"].to_i >= 22 }
 end
 

diff --git a/base/recipes/mysql.rb b/base/recipes/mysql.rb
@@ -35,20 +35,22 @@
   action :nothing
 end
 
-cookbook_files = "#{Chef::Config[:file_cache_path]}/cookbooks/#{cookbook_name}/files/mysql"
 arch = case node["kernel"]["machine"]
   when "aarch64", "arm64" then "arm64"
   else "amd64"
   end
 
 dependencies = node["lsb"]["release"].to_i >= 22 ? ["libevent-core-2.1-6", "libssl1.1_1.1.1f"] : ["libevent-core-2.1-6"]
 dependencies.each do |pkg|
-  execute "dpkg -i #{cookbook_files}/#{pkg}_#{arch}.deb;" do
+  execute "curl -sLO https://miscfile-staging.s3.amazonaws.com/chef/base/mysql/#{pkg}_#{arch}.deb && dpkg -i #{pkg}_#{arch}.deb" do
+    cwd "/tmp"
     not_if "dpkg -S #{pkg} | grep '^#{pkg}'"
   end
 end
 ["mysql-client-core", "mysql-client", "mysql-server-core", "mysql-server"].each do |pkg|
-  execute "DEBIAN_FRONTEND=noninteractive dpkg -i #{cookbook_files}/#{pkg}-#{node["mysql"]["version"]}_#{arch}.deb || true" do
+  package = "#{pkg}-#{node["mysql"]["version"]}_#{arch}.deb"
+  execute "curl -sLO https://miscfile-staging.s3.amazonaws.com/chef/base/mysql/#{package} && (DEBIAN_FRONTEND=noninteractive dpkg -i #{package} || true)" do
+    cwd "/tmp"
     not_if "dpkg -S #{pkg}- | grep '^#{pkg}-#{node["mysql"]["version"].to_i}'"
     notifies :run, "execute[mysql-configure]", :before if pkg == "mysql-server"
     notifies :edit, "replace_or_add[mysql-dpkg-configure]", :immediately if pkg == "mysql-server"