compose binary & devel-gpu

SyneRBI · Jan 26, 2024 · 0711f50 · 0711f50
1 parent e3f0321
commit 0711f50
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/docker/compose.sh b/docker/compose.sh
@@ -48,10 +48,15 @@ test $build$cpu$gpu = 111 && regen_ccache=1 # force rebuild ccache
 echo "cpu: $cpu, gpu: $gpu, update ccache: $update_ccache, regen ccache: $regen_ccache, devel: $devel"
 echo "docker compose options: $@"
 
-DCC_CPU="docker compose -f docker-compose.yml"
-DCC_GPU="$DCC_CPU -f docker/docker-compose.gpu.yml"
+# compose binary
+DCC="${DCC:-docker compose}"
+which docker-compose && DCC=$(which docker-compose)
+# CPU config
+DCC_CPU="$DCC -f docker-compose.yml"
 test $devel = 1 && DCC_CPU+=" -f docker/docker-compose.devel.yml"
-test $devel$gpu = 11 && echo >&2 "WARNING: devel gpu not supported"
+# GPU config
+DCC_GPU="$DCC_CPU -f docker/docker-compose.gpu.yml"
+test $devel = 1 && DCC_CPU+=" -f docker/docker-compose.devel-gpu.yml"
 
 pushd "$(dirname "$(dirname "${BASH_SOURCE[0]}")")"
 git submodule update --init --recursive

diff --git a/docker/docker-compose.devel-gpu.yml b/docker/docker-compose.devel-gpu.yml
@@ -0,0 +1,8 @@
+version: '3.2'
+services:
+ sirf-build:
+  image: synerbi/jupyter:sirf-build-devel-gpu
+ sirf:
+  image: synerbi/sirf:jupyter-devel-gpu
+  build:
+   cache_from: [synerbi/jupyter:sirf-build-devel-gpu]