From 86e88a9fc6a6db2426a92f09c2320a486650ceb4 Mon Sep 17 00:00:00 2001
From: Jagger Wang <jaggerwang@gmail.com>
Date: Thu, 16 Nov 2023 16:58:10 +0800
Subject: [PATCH] Always pull model image
---
.ops/.gitlab-ci.yml | 2 +-
README.md | 6 +++---
backend/Dockerfile | 2 +-
backend/README.md | 2 +-
backend/pom.xml | 2 +-
docker-compose.yml | 29 ++++++++++++++++-------------
6 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/.ops/.gitlab-ci.yml b/.ops/.gitlab-ci.yml
index 88ffc4d0..fda3775e 100644
--- a/.ops/.gitlab-ci.yml
+++ b/.ops/.gitlab-ci.yml
@@ -4,4 +4,4 @@ include:
variables:
APP_NAME: "xtreme1"
- APP_VERSION: "0.7.2"
+ APP_VERSION: "0.7.3"
diff --git a/README.md b/README.md
index 8cc7acf0..b9f489f9 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
<div align="center">
<img width="386" alt="Xtreme1 logo" src="https://user-images.githubusercontent.com/84139543/190300943-98da7d5c-bd67-4074-a94f-b7405d29fb90.png">
-
+
[](https://join.slack.com/t/xtreme1group/shared_invite/zt-1jhk36uzr-NpdpYXeQAEHN6rYJy5_6pg)
[](https://twitter.com/Xtreme1io)
@@ -59,8 +59,8 @@ Image Data Curation (Visualizing & Debug) - [MobileNetV3](https://github.com/xi
Download the latest release package and unzip it.
```bash
-wget https://github.com/xtreme1-io/xtreme1/releases/download/v0.7.2/xtreme1-v0.7.2.zip
-unzip -d xtreme1-v0.7.2 xtreme1-v0.7.2.zip
+wget https://github.com/xtreme1-io/xtreme1/releases/download/v0.7.3/xtreme1-v0.7.3.zip
+unzip -d xtreme1-v0.7.3 xtreme1-v0.7.3.zip
```
## Start all services
diff --git a/backend/Dockerfile b/backend/Dockerfile
index 1f4676dc..fed277b2 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -9,7 +9,7 @@ RUN apt update && \
apt install -y iputils-ping curl wget netcat python3 python3-pip git
RUN pip3 install --upgrade --force-reinstall git+https://github.com/xtreme1-io/xtreme1-sdk.git@d0cf4cc
WORKDIR /app
-COPY --from=build /build/target/xtreme1-backend-0.7.2-SNAPSHOT.jar ./app.jar
+COPY --from=build /build/target/xtreme1-backend-0.7.3-SNAPSHOT.jar ./app.jar
RUN mkdir -p config
RUN wget 'https://basicai-asset.s3.us-west-2.amazonaws.com/xtreme1/xtreme1-lidar-fusion-trial.zip' -O xtreme1-lidar-fusion-trial.zip
RUN wget 'https://basicai-asset.s3.us-west-2.amazonaws.com/xtreme1/xtreme1-image-trial.zip' -O xtreme1-image-trial.zip
diff --git a/backend/README.md b/backend/README.md
index 979bb605..b994785a 100644
--- a/backend/README.md
+++ b/backend/README.md
@@ -92,7 +92,7 @@ cd backend
mvn package
# Using local configuration to start application.
-java -Dspring.profiles.active=local -jar target/xtreme1-backend-0.7.2-SNAPSHOT.jar
+java -Dspring.profiles.active=local -jar target/xtreme1-backend-0.7.3-SNAPSHOT.jar
```
Now you can access the backend service at `http://localhost:8080/`.
diff --git a/backend/pom.xml b/backend/pom.xml
index 8b22b714..e18b3ddb 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -13,7 +13,7 @@
<groupId>ai.basic</groupId>
<artifactId>xtreme1-backend</artifactId>
- <version>0.7.2-SNAPSHOT</version>
+ <version>0.7.3-SNAPSHOT</version>
<name>Xtreme1 Backend</name>
<description></description>
diff --git a/docker-compose.yml b/docker-compose.yml
index ec4ac43a..d88b4875 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3.9'
services:
nginx:
image: nginx:1.22
@@ -65,9 +64,9 @@ services:
retries: 10
backend:
# By default, Compose will pull image from Docker Hub when no local image found.
- image: basicai/xtreme1-backend:v0.7.2
+ image: basicai/xtreme1-backend:v0.7.3
# Uncomment this line and comment previous line to build image locally, not pull from Docker Hub.
- # build: ./backend
+ build: ./backend
ports:
- 8290:8080
# volumes:
@@ -95,13 +94,24 @@ services:
condition: service_healthy
frontend:
# By default, Compose will pull image from Docker Hub when no local image found.
- image: basicai/xtreme1-frontend:v0.7.2
+ image: basicai/xtreme1-frontend:v0.7.3
# Uncomment this line and comment previous line to build image locally, not pull from Docker Hub.
- # build: ./frontend
+ build: ./frontend
ports:
- 8291:80
+ pcd-tools:
+ image: basicai/xtreme1-pcd-tools
+ pull_policy: always
+ ports:
+ - 8295:5000
+ image-vect-visualization:
+ image: basicai/xtreme1-image-vect-visualization
+ pull_policy: always
+ ports:
+ - 8294:5000
image-object-detection:
image: basicai/xtreme1-image-object-detection
+ pull_policy: always
ports:
- 8292:5000
# You need to explicitly specify model profile to start this service.
@@ -110,20 +120,13 @@ services:
runtime: nvidia
point-cloud-object-detection:
image: basicai/xtreme1-point-cloud-object-detection
+ pull_policy: always
ports:
- 8293:5000
# You need to explicitly specify model profile to start this service.
profiles:
- model
runtime: nvidia
- image-vect-visualization:
- image: basicai/xtreme1-image-vect-visualization
- ports:
- - 8294:5000
- pcd-tools:
- image: basicai/xtreme1-pcd-tools
- ports:
- - 8295:5000
volumes:
mysql-data:
redis-data: