update docker-compose for new tagger variants

INL · Nov 15, 2024 · 8826af7 · 8826af7
1 parent 798808d
commit 8826af7
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 9 deletions.
diff --git a/buildall.sh b/buildall.sh
@@ -6,7 +6,7 @@ echo "Will build taggers with version <$VERSION>. Set VERSION to override this."
 # Base image
 docker build --build-arg VERSION=$VERSION -t instituutnederlandsetaal/taggers-dockerized-base:$VERSION base
 
-# ud-parsers
+# UD-parsers
 docker build --build-arg VERSION=$VERSION --build-arg SPACY_MODEL=nl_core_news_lg -t instituutnederlandsetaal/taggers-dockerized-spacy:$VERSION spacy
 docker build --build-arg VERSION=$VERSION -t instituutnederlandsetaal/taggers-dockerized-stanza:$VERSION stanza
 docker build --build-arg VERSION=$VERSION -t instituutnederlandsetaal/taggers-dockerized-flair:$VERSION flair
diff --git a/buildandpushall.sh b/buildandpushall.sh
@@ -14,6 +14,11 @@ docker push instituutnederlandsetaal/taggers-dockerized-pie-tdn-clvn:$VERSION
 docker push instituutnederlandsetaal/taggers-dockerized-pie-tdn-cour:$VERSION
 docker push instituutnederlandsetaal/taggers-dockerized-pie-tdn-dbnldq:$VERSION
 
+# UD-parsers
+docker push instituutnederlandsetaal/taggers-dockerized-spacy:$VERSION
+docker push instituutnederlandsetaal/taggers-dockerized-stanza:$VERSION
+docker push instituutnederlandsetaal/taggers-dockerized-flair:$VERSION
+
 # Huggingface
 # Commented for now, as we need Git LFS to build these. Perhaps in the future.
 # docker push instituutnederlandsetaal/taggers-dockerized-hug-tdn-1400-1600:$VERSION

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -8,7 +8,7 @@ services:
             - NUM_WORKERS=6
             - CALLBACK_SERVER=${CALLBACK_SERVER}
         ports:
-            - 8120:8080
+            - 8120:8080 # cpu & gpu share port: choose one
         deploy:
             resources:
                 limits:
@@ -23,29 +23,53 @@ services:
         image: instituutnederlandsetaal/taggers-dockerized-spacy:${VERSION}
         restart: unless-stopped
         environment:
-            - NUM_WORKERS=1
             - CALLBACK_SERVER=${CALLBACK_SERVER}
         ports:
-            - 8120:8080
+            - 8120:8080 # cpu & gpu share port: choose one
 
-    stanza:
+    stanza-alpino-conll02:
         image: instituutnederlandsetaal/taggers-dockerized-stanza:${VERSION}
         restart: unless-stopped
         environment:
-            - NUM_WORKERS=1
+            - STANZA_MODEL=alpino
             - CALLBACK_SERVER=${CALLBACK_SERVER}
         ports:
             - 8121:8080
 
-    flair:
-        image: instituutnederlandsetaal/taggers-dockerized-flair:${VERSION}
+    stanza-lassysmall-wikiner:
+        image: instituutnederlandsetaal/taggers-dockerized-stanza:${VERSION}
         restart: unless-stopped
         environment:
-            - NUM_WORKERS=1
+            - STANZA_MODEL=lassysmall
             - CALLBACK_SERVER=${CALLBACK_SERVER}
         ports:
             - 8122:8080
 
+    flair-cpu:
+        image: instituutnederlandsetaal/taggers-dockerized-flair:${VERSION}
+        restart: unless-stopped
+        environment:
+            - CALLBACK_SERVER=${CALLBACK_SERVER}
+        ports:
+            - 8123:8080
+
+    flair-gpu:
+        image: instituutnederlandsetaal/taggers-dockerized-flair:${VERSION}
+        restart: unless-stopped
+        environment:
+            - CALLBACK_SERVER=${CALLBACK_SERVER}
+        ports:
+            - 8123:8080
+        deploy:
+            resources:
+                limits:
+                    memory: 4G
+                reservations:
+                    devices:
+                        - driver: nvidia
+                          count: all
+                          capabilities: [ gpu ]
+
 networks:
     default:
         name: taggers-network