Merge pull request #34 from rcland12/linux_develop

Linux develop

app/.dockerignore

@@ -0,0 +1,50 @@
+collect_data.py
+images/logo.png
+
+# Docker files
+Dockerfile
+.dockerignore
+docker-compose*.yml
+
+# Version control
+.git
+.gitignore
+.svn
+.hg
+
+# Python
+__pycache__
+*.pyc
+*.pyo
+*.pyd
+.Python
+*.py[cod]
+*$py.class
+.pytest_cache
+.coverage
+htmlcov/
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Development and IDE files
+.idea/
+.vscode/
+*.swp
+*.swo
+*.swn
+*.bak
+*.log
+
+# OS generated files
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db

app/Dockerfile

@@ -21,6 +21,6 @@ RUN apt-get update && \
         tritonclient[all]
 
 COPY main.py stream.sh entrypoint.sh ./
-COPY ./images/santa*.png ./images/
+COPY ./images/ ./images/
 
 CMD ["/bin/bash", "entrypoint.sh"]

docker-push.sh

@@ -9,23 +9,16 @@ for var in DOCKER_USERNAME DOCKER_PASSWORD LATEST_VERSION; do
     fi
 done
 
-
 docker login -u ${DOCKER_USERNAME} -p ${DOCKER_PASSWORD}
-
-REPO="rcland12/detection-stream"
-VARIANTS=("linux" "linux-triton" "nginx")
-
-process_image() {
-    local variant=$1
-    local latest_tag="${REPO}:${variant}-latest"
-    local version_tag="${REPO}:${variant}-${LATEST_VERSION}"
-
-    docker images -q ${latest_tag} | xargs -I{} docker tag {} ${version_tag}
-    docker push ${version_tag}
-    docker push ${latest_tag}
-    docker rmi -f ${version_tag}
-}
-
-for variant in "${VARIANTS[@]}"; do
-    process_image ${variant}
-done
+docker images -q rcland12/detection-stream:linux-latest | xargs -I{} docker tag {} rcland12/detection-stream:linux-${LATEST_VERSION}
+docker images -q rcland12/detection-stream:linux-triton-latest | xargs -I{} docker tag {} rcland12/detection-stream:linux-triton-${LATEST_VERSION}
+docker images -q rcland12/detection-stream:nginx-latest | xargs -I{} docker tag {} rcland12/detection-stream:nginx-${LATEST_VERSION}
+docker push rcland12/detection-stream:linux-${LATEST_VERSION}
+docker push rcland12/detection-stream:linux-triton-${LATEST_VERSION}
+docker push rcland12/detection-stream:nginx-${LATEST_VERSION}
+docker rmi -f rcland12/detection-stream:linux-${LATEST_VERSION}
+docker rmi -f rcland12/detection-stream:linux-triton-${LATEST_VERSION}
+docker rmi -f rcland12/detection-stream:nginx-${LATEST_VERSION}
+docker push rcland12/detection-stream:linux-latest
+docker push rcland12/detection-stream:linux-triton-latest
+docker push rcland12/detection-stream:nginx-latest

triton/.dockerignore

@@ -0,0 +1,53 @@
+convert.sh
+object_detection/
+postprocess/
+preprocess/
+yolo11/
+
+# Docker files
+Dockerfile
+.dockerignore
+docker-compose*.yml
+
+# Version control
+.git
+.gitignore
+.svn
+.hg
+
+# Python
+__pycache__
+*.pyc
+*.pyo
+*.pyd
+.Python
+*.py[cod]
+*$py.class
+.pytest_cache
+.coverage
+htmlcov/
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Development and IDE files
+.idea/
+.vscode/
+*.swp
+*.swo
+*.swn
+*.bak
+*.log
+
+# OS generated files
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db

triton/ensemble/config.pbtxt → triton/yolo11/config.pbtxt

@@ -1,4 +1,4 @@
-name: "ensemble"
+name: "yolo11"
 platform: "ensemble"
 max_batch_size: 0