Merge pull request #194 from wearepal/cvat

Add CVAT docker images
wearepal · Nov 10, 2023 · 4950326 · 4950326
2 parents 252eee0 + b887310
commit 4950326
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 20 deletions.
diff --git a/Caddyfile b/Caddyfile
@@ -9,3 +9,13 @@ $LMTADDRESS {
   encode gzip
   log
 }
+
+$ANNOADDRESS {
+
+  reverse_proxy cvat:80 {
+    lb_try_duration 30s
+  }
+
+  encode gzip
+  log
+}
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,46 +3,46 @@ services:
   caddy:
     image: caddy:2
     configs:
-    - source: caddyfile
-      target: /etc/caddy/Caddyfile
+      - source: caddyfile
+        target: /etc/caddy/Caddyfile
     ports:
-    - target: 80
-      published: 80
-      protocol: tcp
-      mode: ingress
-    - target: 443
-      published: 443
-      protocol: tcp
-      mode: ingress
+      - target: 80
+        published: 80
+        protocol: tcp
+        mode: ingress
+      - target: 443
+        published: 443
+        protocol: tcp
+        mode: ingress
     volumes:
-    - caddy:/data
+      - caddy:/data
 
   db:
     image: postgres:14
     environment:
       - POSTGRES_HOST_AUTH_METHOD=trust
     volumes:
-    - postgres:/var/lib/postgresql/data
-  
+      - postgres:/var/lib/postgresql/data
+
   geoserver:
     image: docker.osgeo.org/geoserver:2.21.2
     environment:
       - GEOSERVER_CSRF_WHITELIST=landscapes.wearepal.ai
       - EXTRA_JAVA_OPTS=-Xmx10g
     volumes:
-    - geoserver:/opt/geoserver_data
+      - geoserver:/opt/geoserver_data
 
   queue:
     image: redis:7
     command: redis-server --appendonly yes
     volumes:
-    - redis_queue:/data
+      - redis_queue:/data
 
   migration:
     image: "wearepal/landscapes:${VERSION}"
     command: bin/run-migrations
     secrets:
-    - secret_key_base
+      - secret_key_base
     deploy:
       restart_policy:
         condition: none
@@ -55,9 +55,9 @@ services:
       options:
         max-size: "1G"
     secrets:
-    - secret_key_base
+      - secret_key_base
     volumes:
-    - storage:/app/storage
+      - storage:/app/storage
 
   worker:
     image: "wearepal/landscapes:${VERSION}"
@@ -68,9 +68,21 @@ services:
       options:
         max-size: "1G"
     secrets:
-    - secret_key_base
+      - secret_key_base
+    volumes:
+      - storage:/app/storage
+
+  cvat_server:
+    image: cvat/server:v2.8.2
+    ports:
+      - 8080:8080
     volumes:
-    - storage:/app/storage
+      - cvat_data:/opt/cvat_data
+
+  cvat:
+    image: cvat/ui:v2.8.2
+    ports:
+      - 80:80
 
 configs:
   caddyfile:
@@ -88,3 +100,4 @@ volumes:
   postgres:
   redis_queue:
   storage:
+  cvat_data: