Browse Source

add devcontainer

boyrobot 1 year ago
parent
commit
0b19a9eb37
5 changed files with 23 additions and 16 deletions
  1. 4 3
      .devcontainer/devcontainer.json
  2. 0 12
      Dockerfile
  3. 7 1
      README.md
  4. 2 0
      apps/views/__init__.py
  5. 10 0
      apps/views/home.py

+ 4 - 3
.devcontainer/devcontainer.json

@@ -3,9 +3,10 @@
     "customizations": {
         "vscode": {
             "extensions": [
-                "Vue.volar",
-                "ms-python.python"
-            ]
+				"Vue.volar",
+				"ms-python.python",
+				"ms-azuretools.vscode-docker"
+			]
         }
     }
 }

+ 0 - 12
Dockerfile

@@ -1,25 +1,13 @@
 # For more information, please refer to https://aka.ms/vscode-docker-python
 FROM python:3.10-slim
-
 EXPOSE 5002
-
-# Keeps Python from generating .pyc files in the container
 ENV PYTHONDONTWRITEBYTECODE=1
-
-# Turns off buffering for easier container logging
 ENV PYTHONUNBUFFERED=1
-
-# Install pip requirements
 COPY requirements.txt .
 RUN python -m pip install -r requirements.txt
 
 WORKDIR /app
 COPY . /app
-
-# Creates a non-root user with an explicit UID and adds permission to access the /app folder
-# For more info, please refer to https://aka.ms/vscode-docker-python-configure-containers
 RUN adduser -u 5678 --disabled-password --gecos "" appuser && chown -R appuser /app
 USER appuser
-
-# During debugging, this entry point will be overridden. For more information, please refer to https://aka.ms/vscode-docker-python-debug
 CMD ["gunicorn", "--bind", "0.0.0.0:5002", "back-end.app:app"]

+ 7 - 1
README.md

@@ -12,6 +12,7 @@ npm install
 export NODE_OPTIONS=--openssl-legacy-provider
 npm run serve
 npm run build
+tar -zcf dist.tar.gz dist
 
 sudo apt update
 sudo apt-get install ffmpeg libsm6 libxext6  -y
@@ -19,10 +20,15 @@ sudo apt-get install ffmpeg libsm6 libxext6  -y
 cd ..
 virtualenv .venv
 pip install -r requirements.txt
-cp -R frontend/dist/* ./static
+cp -R dist/* ../static
 python app.py
 ```
 
+docker:
+```
+docker build -t jianboy/objectdetector:latest .
+```
+
 ## YOLOv5模型训练
 
 yolov5m.pt 模型。

+ 2 - 0
apps/views/__init__.py

@@ -1,7 +1,9 @@
 
 from .api import v1_bp, v2_bp
+from .home import bp_home
 from flask import Flask
 
 def init_blueprints(app: Flask):
     app.register_blueprint(v1_bp)
     app.register_blueprint(v2_bp)
+    app.register_blueprint(bp_home)

+ 10 - 0
apps/views/home.py

@@ -0,0 +1,10 @@
+from flask import Blueprint, request, jsonify, redirect, url_for, current_app, send_from_directory, make_response
+import datetime
+import os
+import shutil
+
+bp_home = Blueprint('home', __name__)
+
+@bp_home.route('/')
+def hello_world():
+    return redirect(url_for('static', filename='./index.html'))