Skip to content

Commit b894dd3

Browse files
committed
Merge branch 'main' of github.com:srmproject/Backend-python
2 parents 9c79d57 + 7e184ad commit b894dd3

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

app/main.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,16 @@
22
from config import cnf
33
from api.project import router as project_router
44
from logger import log
5-
5+
from fastapi.middleware.cors import CORSMiddleware
66

77
app = FastAPI()
8+
app.add_middleware(
9+
CORSMiddleware,
10+
allow_origins=["*"],
11+
allow_credentials=True,
12+
allow_methods=["*"],
13+
allow_headers=["*"],
14+
)
815
app.include_router(project_router)
916

1017
@app.get("/")

cicd/dev/Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ pipeline {
5151
dir("dev") {
5252
sh """
5353
tmp_image_name="${REGISTRY}/${docker_image_name}" yq -i '.images[0].newName = env(tmp_image_name)' kustomization.yaml
54-
tmp_image_tag="${tag}" yq -i '.images[0].newTage = env(tmp_image_tag)' kustomization.yaml
54+
tmp_image_tag="${tag}" yq -i '.images[0].newTag = strenv(tmp_image_tag)' kustomization.yaml
5555
"""
5656

5757
withCredentials([sshUserPrivateKey(credentialsId: "JCP-FRONTEND-CORE-SSHKEY", keyFileVariable: "SSH_KEY")]) {

0 commit comments

Comments
 (0)