Compare commits

...

18 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
7 changed files with 31 additions and 95 deletions

View File

@ -85,7 +85,10 @@ steps:
- apk add --no-cache git yq
- 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/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
- |
TAG="${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA:0:7}"
@ -94,3 +97,22 @@ steps:
git add manifests/${CI_REPO_NAME}/values.yaml
git commit -m "backend: update tag to $TAG" || echo "No changes"
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.middleware.cors import CORSMiddleware
from fastapi.responses import JSONResponse
import uvicorn
import os
from dotenv import load_dotenv
import yaml
@ -150,5 +151,4 @@ app.include_router(router, prefix="/api")
# ✅ This is the missing part:
if __name__ == "__main__":
import uvicorn
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
CMD ["nginx", "-g", "daemon off;"]

View File

@ -8,8 +8,6 @@
"name": "frontend",
"version": "0.0.0",
"dependencies": {
"@react-keycloak/web": "^3.4.0",
"keycloak-js": "^26.2.0",
"react": "^19.1.0",
"react-beautiful-dnd": "^13.1.1",
"react-dom": "^19.1.0",
@ -964,46 +962,6 @@
"@jridgewell/sourcemap-codec": "^1.4.14"
}
},
"node_modules/@react-keycloak/core": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/@react-keycloak/core/-/core-3.2.0.tgz",
"integrity": "sha512-1yzU7gQzs+6E1v6hGqxy0Q+kpMHg9sEcke2yxZR29WoU8KNE8E50xS6UbI8N7rWsgyYw8r9W1cUPCOF48MYjzw==",
"dependencies": {
"react-fast-compare": "^3.2.0"
},
"funding": {
"type": "patreon",
"url": "https://www.patreon.com/reactkeycloak"
},
"peerDependencies": {
"react": ">=16"
}
},
"node_modules/@react-keycloak/web": {
"version": "3.4.0",
"resolved": "https://registry.npmjs.org/@react-keycloak/web/-/web-3.4.0.tgz",
"integrity": "sha512-yKKSCyqBtn7dt+VckYOW1IM5NW999pPkxDZOXqJ6dfXPXstYhOQCkTZqh8l7UL14PkpsoaHDh7hSJH8whah01g==",
"dependencies": {
"@babel/runtime": "^7.9.0",
"@react-keycloak/core": "^3.2.0",
"hoist-non-react-statics": "^3.3.2"
},
"funding": {
"type": "patreon",
"url": "https://www.patreon.com/reactkeycloak"
},
"peerDependencies": {
"keycloak-js": ">=9.0.2",
"react": ">=16.8",
"react-dom": ">=16.8",
"typescript": ">=3.8"
},
"peerDependenciesMeta": {
"typescript": {
"optional": true
}
}
},
"node_modules/@rolldown/pluginutils": {
"version": "1.0.0-beta.9",
"resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.9.tgz",
@ -2122,11 +2080,6 @@
"node": ">=6"
}
},
"node_modules/keycloak-js": {
"version": "26.2.0",
"resolved": "https://registry.npmjs.org/keycloak-js/-/keycloak-js-26.2.0.tgz",
"integrity": "sha512-CrFcXTN+d6J0V/1v3Zpioys6qHNWE6yUzVVIsCUAmFn9H14GZ0vuYod+lt+SSpMgWGPuneDZBSGBAeLBFuqjsw=="
},
"node_modules/keyv": {
"version": "4.5.4",
"resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
@ -2450,11 +2403,6 @@
"react": "^19.1.0"
}
},
"node_modules/react-fast-compare": {
"version": "3.2.2",
"resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.2.tgz",
"integrity": "sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ=="
},
"node_modules/react-icons": {
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/react-icons/-/react-icons-5.5.0.tgz",

View File

@ -10,8 +10,6 @@
"preview": "vite preview"
},
"dependencies": {
"@react-keycloak/web": "^3.4.0",
"keycloak-js": "^26.2.0",
"react": "^19.1.0",
"react-beautiful-dnd": "^13.1.1",
"react-dom": "^19.1.0",

View File

@ -1,9 +0,0 @@
import Keycloak from 'keycloak-js';
const keycloak = new Keycloak({
url: 'https://keycloak.dvirlabs.com/',
realm: 'lab', // ⬅️ Change to your realm name
clientId: 'navix', // ⬅️ Change to your client ID in Keycloak
});
export default keycloak;

View File

@ -1,32 +1,10 @@
import { StrictMode, useState, useEffect } from 'react';
import { createRoot } from 'react-dom/client';
import './index.css';
import App from './App.jsx';
import keycloak from './keycloak';
function SecuredApp() {
const [authenticated, setAuthenticated] = useState(false);
useEffect(() => {
keycloak.init({ onLoad: 'login-required' }).then((auth) => {
if (!auth) {
window.location.reload();
} else {
setAuthenticated(true);
}
});
// Optional: refresh token
setInterval(() => {
keycloak.updateToken(70).catch(() => keycloak.logout());
}, 6000);
}, []);
return authenticated ? <App /> : <div>Loading...</div>;
}
import { StrictMode } from 'react'
import { createRoot } from 'react-dom/client'
import './index.css'
import App from './App.jsx'
createRoot(document.getElementById('root')).render(
<StrictMode>
<SecuredApp />
</StrictMode>
);
<App />
</StrictMode>,
)