Skip to content

Commit

Permalink
removing reference to previous registry and ading new ones (#8)
Browse files Browse the repository at this point in the history
* removing reference to previous gitlab registry

* adding badge to readme

* Solving issue dockerfile orchestrator freezing miniconda version

* update ci using latest tag images

* adjusting container names
  • Loading branch information
LouisonR-octo authored Dec 26, 2022
1 parent 651b510 commit dffbbbb
Show file tree
Hide file tree
Showing 26 changed files with 97 additions and 335 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ci_edge_interface.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,7 @@ jobs:
tags: |
type=ref,event=branch
type=ref,event=pr
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{major}}.{{minor}}.{{patch}}
flavor: latest=auto

- name: Build and push Docker images
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/ci_edge_orchestrator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ jobs:
ports:
- 27017:27017
model_serving:
image: ghcr.io/octo-technology/vio/edge_model_serving:ci-cd-github-actions
image: ghcr.io/octo-technology/vio/edge_model_serving:latest
ports:
- 8501:8501
tflite_serving:
image: ghcr.io/octo-technology/vio/edge_tflite_serving:ci-cd-github-actions
image: ghcr.io/octo-technology/vio/edge_tflite_serving:latest
ports:
- 8502:8501
env:
Expand Down Expand Up @@ -123,8 +123,7 @@ jobs:
tags: |
type=ref,event=branch
type=ref,event=pr
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{major}}.{{minor}}.{{patch}}
flavor: latest=auto

- name: Build and push Docker images
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/publication_vio_images_raspberry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ jobs:
fail-fast: false
matrix:
include:
- dockerfile: ./edge_interface/Dockerfile.raspberry
image: ghcr.io/${{ github.repository }}/edge_interface.raspberry
- dockerfile: ./edge_interface/Dockerfile.raspberrypi
image: ghcr.io/${{ github.repository }}/edge_interface.raspberrypi
context: ./edge_interface
- dockerfile: ./supervisor/Dockerfile.raspberry
image: ghcr.io/${{ github.repository }}/edge_orchestrator.raspberry
- dockerfile: ./supervisor/Dockerfile.raspberrypi
image: ghcr.io/${{ github.repository }}/edge_orchestrator.raspberrypi
context: ./supervisor
- dockerfile: ./model_serving/Dockerfile.raspberry
image: ghcr.io/${{ github.repository }}/edge_model_serving.raspberry
- dockerfile: ./model_serving/Dockerfile.raspberrypi
image: ghcr.io/${{ github.repository }}/edge_model_serving.raspberrypi
context: ./model_serving
- dockerfile: ./tflite_serving/Dockerfile.raspberry
image: ghcr.io/${{ github.repository }}/edge_tflite_serving.raspberry
- dockerfile: ./tflite_serving/Dockerfile.raspberrypi
image: ghcr.io/${{ github.repository }}/edge_tflite_serving.raspberrypi
context: ./tflite_serving
permissions:
packages: write
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -169,3 +169,4 @@ poetry.toml

# End of https://www.toptal.com/developers/gitignore/api/python
supervisor/data/storage/
supervisor/reports
28 changes: 14 additions & 14 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,28 +10,28 @@ help:
grep -E '^\.PHONY: [a-zA-Z0-9_-]+ .*?## .*$$' $(MAKEFILE_LIST) | \
awk 'BEGIN {FS = "(: |##)"}; {printf "\033[36m%-30s\033[0m %s\n", $$2, $$3}'

.PHONY: model_serving ## 💁 Start model_serving service (Docker container)
.PHONY: edge_model_serving ## 💁 Start model_serving service (Docker container)
model_serving:
docker-compose up -d --build model_serving
docker-compose up -d --build edge_model_serving

.PHONY: supervisor ## 🕵 Start supervisor service (Docker container)
supervisor:
docker-compose up -d --build supervisor
.PHONY: edge_orchestrator ## 🕵 Start supervisor service (Docker container)
edge_orchestrator:
docker-compose up -d --build edge_orchestrator

.PHONY: edge_interface ## 📸 Start ui inside a docker container
.PHONY: edge_interface ## 📸 Start edge_interface inside a docker container
edge_interface:
docker-compose up -d --build edge_interface

.PHONY: mongodb ## 📁 Start mongodb inside a docker container
mongodb:
docker-compose up -d --build mongodb
.PHONY: edge_db ## 📁 Start edge_db inside a docker container
edge_db:
docker-compose up -d --build edge_db

.PHONY: grafana-local ## ⚙️ Start grafana inside a docker container
grafana-local:
docker-compose up -d --build grafana
.PHONY: hub_monitoring ## ⚙️ Start hub_monitoring inside a docker container
hub_monitoring:
docker-compose up -d --build hub_monitoring

.PHONY: deploy-grafana-azure ## ⚙️ Deploy grafana files in Azure
deploy-grafana-azure:
.PHONY: deploy-hub_monitoring-azure ## ⚙️ Deploy hub_monitoring files in Azure
deploy-hub_monitoring-azure:
ssh-add deployment/grafvio_id_rsa # chmod 400 deployment/grafvio_id_rsa
ansible-playbook deployment/ansible/update_grafana_dashboard.yml -i deployment/ansible/inventory --extra-vars ansible_port=22000

Expand Down
15 changes: 9 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
![edge_orchestrator CI](https://github.com/octo-technology/VIO/actions/workflows/edge_orchestrator_ci.yml/badge.svg)![GitHub issues](https://img.shields.io/github/issues/octo-technology/VIO)
# VIO-EDGE
# Visual Inspection Orchestrator

![CI edge_orchestrator](https://github.com/octo-technology/VIO/actions/workflows/ci_edge_orchestrator.yml/badge.svg)
![CI edge_interface](https://github.com/octo-technology/VIO/actions/workflows/ci_edge_interface.yml/badge.svg)
![GitHub issues](https://img.shields.io/github/issues/octo-technology/VIO)

Visual Inspection Orchestrator is a modular framework made to ease the deployment of VI usecases.

Expand All @@ -9,11 +12,11 @@ VIO full documentation can be found [here](https://octo-technology.github.io/VIO

## Features

- [The core](docs/supervisor.md)
- [The deployment tools](docs/deployment.md)
- [The fleet monitoring](docs/monitoring.md)
- [The edge orchestrator](docs/supervisor.md)
- [The edge interface](docs/edge_interface.md)
- [The model serving](docs/model_serving.md)
- [The edge model serving](docs/model_serving.md)
- [The hub monitoring](docs/monitoring.md)
- [The deployment tools](docs/deployment.md)

## Install the framework

Expand Down
Loading

0 comments on commit dffbbbb

Please sign in to comment.