Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove make #13321

Closed
wants to merge 27 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
rename models-yolov5 repo name -> models-bee-detector
  • Loading branch information
tot-ra committed Oct 6, 2023
commit 253c5742b21c787cede3ca6393e3cd8cc52022aa
85 changes: 0 additions & 85 deletions .github/ISSUE_TEMPLATE/bug-report.yml

This file was deleted.

8 changes: 0 additions & 8 deletions .github/ISSUE_TEMPLATE/config.yml

This file was deleted.

50 changes: 0 additions & 50 deletions .github/ISSUE_TEMPLATE/feature-request.yml

This file was deleted.

33 changes: 0 additions & 33 deletions .github/ISSUE_TEMPLATE/question.yml

This file was deleted.

9 changes: 0 additions & 9 deletions .github/PULL_REQUEST_TEMPLATE.md

This file was deleted.

23 changes: 0 additions & 23 deletions .github/dependabot.yml

This file was deleted.

17 changes: 17 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: deploy
on:
push:
branches: main
workflow_dispatch:

jobs:
deploy:
runs-on: self-hosted
steps:
- name: pull
working-directory: /www/models-bee-detector/
run: git reset --hard && git pull

- name: restart
working-directory: /www/models-bee-detector/
run: chmod +x restart.sh && ./restart.sh
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ stop:
COMPOSE_PROJECT_NAME=gratheon docker compose -f docker-compose.dev.yml down

deploy-copy:
rsync -av -e ssh * root@gratheon.com:/www/models-yolov5/
rsync -av -e ssh * root@gratheon.com:/www/models-bee-detector/

deploy-run:
ssh root@gratheon.com 'chmod +x /www/models-yolov5/restart.sh'
ssh root@gratheon.com 'bash /www/models-yolov5/restart.sh'
ssh root@gratheon.com 'chmod +x /www/models-bee-detector/restart.sh'
ssh root@gratheon.com 'bash /www/models-bee-detector/restart.sh'

deploy:
make deploy-copy
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
## gratheon/models-yolov5 bee detection
## gratheon/models-bee-detector

Microservice that detects bees

- Uses weights by Matt Nudi
https://github.com/mattnudi/bee-detection
Expand Down
2 changes: 1 addition & 1 deletion Tiltfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
docker_compose('docker-compose.dev.yml',project_name="gratheon")
docker_build('local/models-yolov5', '.',
docker_build('local/models-bee-detector', '.',
live_update = [
# Sync local files into the container.
sync('.', '/app/'),
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.dev.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
version: '3.9'
services:
models-yolov5:
image: local/models-yolov5
models-bee-detector:
image: local/models-bee-detector
# build: .
command:
ddtrace-run python3 /app/server.py
environment:
- ENV_ID=dev
- DD_SERVICE=models-yolov5
- DD_SERVICE=models-bee-detector
- DD_ENV=dev
- DD_LOGS_INJECTION=true
- DD_PROFILING_ENABLED=true
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
version: '3.8'
services:
models-yolov5:
models-bee-detector:
build:
context: .
dockerfile: Dockerfile.prod
command:
ddtrace-run python3 /app/server.py
environment:
- ENV_ID=prod
- DD_SERVICE=models-yolov5
- DD_SERVICE=models-bee-detector
- DD_ENV=prod
- DD_LOGS_INJECTION=true
- DD_PROFILING_ENABLED=true
Expand Down
2 changes: 1 addition & 1 deletion restart.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cd /www/models-yolov5/
cd /www/models-bee-detector/

chmod 777 tmp
chmod 755 weights
Expand Down