Skip to content

Commit

Permalink
Always pull model image
Browse files Browse the repository at this point in the history
  • Loading branch information
jaggerwang committed Nov 16, 2023
1 parent fbd8331 commit 86e88a9
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .ops/.gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ include:

variables:
APP_NAME: "xtreme1"
APP_VERSION: "0.7.2"
APP_VERSION: "0.7.3"
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -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://img.shields.io/badge/Release-v0.7.2-green)
![](https://img.shields.io/badge/Release-v0.7.3-green)
![](https://img.shields.io/badge/License-Apache%202.0-blueviolet)
[![Slack](https://img.shields.io/badge/Join-Slack-orange.svg?logo=slack)](https://join.slack.com/t/xtreme1group/shared_invite/zt-1jhk36uzr-NpdpYXeQAEHN6rYJy5_6pg)
[![Twitter](https://img.shields.io/badge/Follow-Twitter-blue)](https://twitter.com/Xtreme1io)
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion backend/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/`.
Expand Down
2 changes: 1 addition & 1 deletion backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
29 changes: 16 additions & 13 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '3.9'
services:
nginx:
image: nginx:1.22
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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.
Expand All @@ -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:
Expand Down

0 comments on commit 86e88a9

Please sign in to comment.