Add buildx back, didn't solve parallel docker build issues

OSC · Nov 9, 2024 · 934167c · 934167c
1 parent f0fca59
commit 934167c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/ood_packaging/build_box.rb b/lib/ood_packaging/build_box.rb
@@ -155,7 +155,7 @@ def scripts
 
   def build_command
     if container_runtime == 'docker'
-      ['build']
+      ['buildx', 'build']
     else
       ['build']
     end

diff --git a/spec/ood_packaging/build_box_spec.rb b/spec/ood_packaging/build_box_spec.rb
@@ -27,7 +27,7 @@
     context 'when building for el8' do
       it 'executes el8 build command' do
         expected_cmd = [
-          'docker build', '--platform linux/amd64',
+          'docker buildx build', '--platform linux/amd64',
           "--tag ohiosupercomputer/ood-buildbox-el8-x86_64:#{OodPackaging::VERSION}",
           '--output', 'type=docker', '-f /tmp/dockerfile /fake-builddir'
         ]
@@ -41,7 +41,7 @@
 
       it 'executes ubuntu-20.04 build command' do
         expected_cmd = [
-          'docker build', '--platform linux/amd64',
+          'docker buildx build', '--platform linux/amd64',
           "--tag ohiosupercomputer/ood-buildbox-ubuntu-20.04-x86_64:#{OodPackaging::VERSION}",
           '--output', 'type=docker', '-f /tmp/dockerfile /fake-builddir'
         ]
@@ -55,7 +55,7 @@
 
       it 'executes aarch64 build command' do
         expected_cmd = [
-          'docker build', '--platform linux/arm64',
+          'docker buildx build', '--platform linux/arm64',
           "--tag ohiosupercomputer/ood-buildbox-el8-aarch64:#{OodPackaging::VERSION}",
           '--output', 'type=docker', '-f /tmp/dockerfile /fake-builddir'
         ]