.gitlab-ci.yml

@@ -4,6 +4,7 @@ variables:
   LATEST_VERSION: latest
   K8S_NS: default
   DEPLOYMENT_NAME: fastapi-app-template
+  TAG: master
 
 before_script:
   - PATH=.:$PATH
@@ -13,12 +14,12 @@ stages:
   - build
   - deploy
 
-build-staging:dep:
+deploy-staging:dep:
   stage: build
   only:
     - master
   tags:
-    - master
+    - $TAG
   script:
     - echo "===== start build =========="
     - docker build -t ${IMAGE_NAME} .
@@ -28,12 +29,13 @@ build-staging:dep:
 
 deploy-staging:dep:
   stage: deploy
-  tags:
+  only:
     - master
+  tags:
+    - $TAG
   script:
     - echo "===== start deploy =========="
-    - echo $CI_COMMIT_BRANCH
-    - if [[ $CI_COMMIT_BRANCH == 'master' ]] && [[ "$(kubectl get deployment -n $K8S_NS | grep $DEPLOYMENT_NAME | awk '{print $1}')" ]]; then
+    - if [ "$(kubectl get deployment -n $K8S_NS | grep $DEPLOYMENT_NAME | awk '{print $1}')" ]; then
     -   kubectl rollout restart deployment $DEPLOYMENT_NAME -n $K8S_NS
     - fi
     - echo "===== end deploy !!!!!======="

requirements.txt

@@ -7,12 +7,13 @@ fastapi==0.89.1
 fastapi-plugins==0.11.0
 FastAPI-SQLAlchemy==0.2.1
 pydantic==1.10.4
-# pydantic-sqlalchemy==0.0.9
+pydantic-sqlalchemy==0.0.9
 python-multipart==0.0.5
 pytest==7.2.1
 requests==2.28.2
 sqlacodegen==2.3.0
 SQLAlchemy==2.0.1
+starlette==0.23.1
 uvicorn==0.20.0
 PyJWT==2.6.0
 passlib==1.7.4