Compare commits

..

21 Commits

Author SHA1 Message Date
f87719e03b Test pipeline 2025-08-05 03:39:07 +03:00
1a1b37266c Test pipeline 2025-08-05 03:32:01 +03:00
dvirlabs
ff97d4f2eb test 2025-07-28 16:08:02 +03:00
dvirlabs
e56328bd13 test 2025-07-23 13:38:40 +03:00
dvirlabs
cfb4281744 Test build 2025-07-22 18:32:59 +03:00
ffaa2f6c52 Import uvicorn at the begin 2025-07-10 21:21:29 +03:00
dvirlabs
35d70d06c8 Set new message for the pipeline 2025-07-07 19:01:18 +03:00
62a27698bf build front and back 2025-07-06 19:44:02 +03:00
bd9e108934 Update pipeline 2025-07-06 19:37:58 +03:00
ffa4f6606d Merge branch 'master' into revert-to-clean 2025-07-06 19:27:52 +03:00
e3e6e7339b Merge pull request 'prev version for real' (#25) from prev-version into master
Reviewed-on: #25
2025-07-06 16:03:58 +00:00
505b51e53a prev version for real 2025-07-06 19:03:06 +03:00
4b993c0251 Merge pull request 'Prev version' (#24) from fix-tag-pipeline into master
Reviewed-on: #24
2025-07-06 15:27:54 +00:00
5bbdce4f03 Prev version 2025-07-06 18:22:19 +03:00
83ef4f6435 Try tigger gitops pipeline 2025-07-06 00:47:24 +03:00
e64715eafc Try tigger gitops pipeline 2025-07-06 00:46:37 +03:00
1654d2b3d2 Trigger apps-gitops pipeline 2025-07-05 21:45:39 +03:00
8cf70319e6 Merge pull request 'develop' (#23) from develop into master
Reviewed-on: #23
2025-07-04 16:04:13 +00:00
52a1f2b4ae Update the pipeline to support tags 2025-07-04 19:03:40 +03:00
18c35aa398 Merge pull request 'try oidc' (#22) from oidc into develop
Reviewed-on: #22
2025-07-04 14:33:16 +00:00
cc1658c355 try oidc 2025-07-04 17:31:47 +03:00
3 changed files with 26 additions and 5 deletions

View File

@ -14,7 +14,7 @@ steps:
context: frontend context: frontend
tags: tags:
- latest - latest
- ${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA:0:7} - ${CI_COMMIT_TAG:-${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA:0:7}}
username: username:
from_secret: DOCKER_USERNAME from_secret: DOCKER_USERNAME
password: password:
@ -35,7 +35,7 @@ steps:
context: backend context: backend
tags: tags:
- latest - latest
- ${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA:0:7} - ${CI_COMMIT_TAG:-${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA:0:7}}
username: username:
from_secret: DOCKER_USERNAME from_secret: DOCKER_USERNAME
password: password:
@ -85,7 +85,10 @@ steps:
- apk add --no-cache git yq - apk add --no-cache git yq
- git config --global user.name "woodpecker-bot" - git config --global user.name "woodpecker-bot"
- git config --global user.email "ci@dvirlabs.com" - git config --global user.email "ci@dvirlabs.com"
- git clone "https://$${GIT_USERNAME}:$${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git" - |
if [ ! -d "my-apps" ]; then
git clone "https://${GIT_USERNAME}:${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
fi
- cd my-apps - cd my-apps
- | - |
TAG="${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA:0:7}" TAG="${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA:0:7}"
@ -94,3 +97,22 @@ steps:
git add manifests/${CI_REPO_NAME}/values.yaml git add manifests/${CI_REPO_NAME}/values.yaml
git commit -m "backend: update tag to $TAG" || echo "No changes" git commit -m "backend: update tag to $TAG" || echo "No changes"
git push origin HEAD git push origin HEAD
trigger-gitops-via-push:
name: Trigger apps-gitops via Git push
image: alpine/git
environment:
GIT_USERNAME:
from_secret: GIT_USERNAME
GIT_TOKEN:
from_secret: GIT_TOKEN
commands: |
git config --global user.name "woodpecker-bot"
git config --global user.email "ci@dvirlabs.com"
git clone "https://$${GIT_USERNAME}:$${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/apps-gitops.git"
cd apps-gitops
echo "# trigger at $(date) by $${CI_REPO_NAME}" >> .trigger
git add .trigger
git commit -m "ci: trigger apps-gitops build" || echo "no changes"
git push origin HEAD

View File

@ -1,6 +1,7 @@
from fastapi import FastAPI, APIRouter from fastapi import FastAPI, APIRouter
from fastapi.middleware.cors import CORSMiddleware from fastapi.middleware.cors import CORSMiddleware
from fastapi.responses import JSONResponse from fastapi.responses import JSONResponse
import uvicorn
import os import os
from dotenv import load_dotenv from dotenv import load_dotenv
import yaml import yaml
@ -150,5 +151,4 @@ app.include_router(router, prefix="/api")
# ✅ This is the missing part: # ✅ This is the missing part:
if __name__ == "__main__": if __name__ == "__main__":
import uvicorn
uvicorn.run("main:app", host="0.0.0.0", port=8000, reload=True) uvicorn.run("main:app", host="0.0.0.0", port=8000, reload=True)

View File

@ -27,4 +27,3 @@ RUN dos2unix /docker-entrypoint.d/10-generate-env.sh && chmod +x /docker-entrypo
EXPOSE 80 EXPOSE 80
CMD ["nginx", "-g", "daemon off;"] CMD ["nginx", "-g", "daemon off;"]