Merge pull request #52 from sileht/image_type

sileht · web-flow · commit a0867fc39ed2 · 2021-03-08T14:43:52.000+01:00
feat: allow to change the deepdetect image via env
diff --git a/README.md b/README.md
@@ -112,15 +112,16 @@ In `gpuInfo.servers` array, add the following item:
 }
 ```
 
-## Configuration of docker image versions
+## Configuration of docker image type and versions
 
 Docker-compose uses the `latest` tag for all docker images that correspond to
 the latest stable version.
 
 You can select the wanted version with these following environment variables:
 
 ```
-DD_SERVER_TAG=latest
+DD_SERVER_IMAGE=gpu_torch
+DD_SERVER_TAG=v0.14.0
 DD_PLATFORM_UI_TAG=latest
 DD_JUPYTER_TAG=latest
 DD_FILEBROWSER_TAG=latest
diff --git a/code/cpu/.env b/code/cpu/.env
@@ -1,5 +1,6 @@
 DD_PLATFORM=./../..
 DD_SERVER_TAG=v0.14.0
+DD_SERVER_IMAGE=cpu
 DD_PLATFORM_UI_TAG=v0.14.0
 DD_JUPYTER_TAG=latest
 DD_FILEBROWSER_TAG=latest
diff --git a/code/cpu/docker-compose.yml b/code/cpu/docker-compose.yml
@@ -19,7 +19,7 @@ services:
   #
 
   deepdetect:
-    image: jolibrain/deepdetect_cpu:${DD_SERVER_TAG}
+    image: jolibrain/deepdetect_${DD_SERVER_IMAGE}:${DD_SERVER_TAG}
     restart: always
     user: ${CURRENT_UID}
     volumes:
diff --git a/code/gpu/.env b/code/gpu/.env
@@ -1,5 +1,6 @@
 DD_PLATFORM=./../..
 DD_SERVER_TAG=v0.14.0
+DD_SERVER_IMAGE=gpu
 DD_PLATFORM_UI_TAG=v0.14.0
 DD_JUPYTER_TAG=latest
 DD_FILEBROWSER_TAG=latest
diff --git a/code/gpu/docker-compose.yml b/code/gpu/docker-compose.yml
@@ -19,7 +19,7 @@ services:
   #
 
   deepdetect:
-    image: jolibrain/deepdetect_gpu:${DD_SERVER_TAG}
+    image: jolibrain/deepdetect_${DD_SERVER_IMAGE}:${DD_SERVER_TAG}
     runtime: nvidia
     restart: always
     volumes:

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ services:`
`19`	`19`	`#`
`20`	`20`
`21`	`21`	`deepdetect:`
`22`		`- image: jolibrain/deepdetect_cpu:${DD_SERVER_TAG}`
	`22`	`+ image: jolibrain/deepdetect_${DD_SERVER_IMAGE}:${DD_SERVER_TAG}`
`23`	`23`	`restart: always`
`24`	`24`	`user: ${CURRENT_UID}`
`25`	`25`	`volumes:`