Compare commits
26 Commits
301cf5922e
...
jenkins-pi
Author | SHA1 | Date | |
---|---|---|---|
1de32691c6 | |||
f05d3940fa | |||
023daf1d4b | |||
e91273888a | |||
247798abc8 | |||
600b5aeba8 | |||
c9b1dac864 | |||
a79ae2d50f | |||
cd4ab3fd27 | |||
d9fe927832 | |||
99cfdfddd0 | |||
f579e440f8 | |||
ba69728c81 | |||
5366e313c5 | |||
283be1a1ec | |||
1b7204c2ba | |||
8f9aed299d | |||
6522977280 | |||
c707974a2e | |||
cc2f224d60 | |||
b14e6cf873 | |||
87e3c0df80 | |||
aea09a6081 | |||
d05cede409 | |||
17162027b6 | |||
8887f1b2bd |
83
.jenkins/Jenkinsfile
vendored
Normal file
83
.jenkins/Jenkinsfile
vendored
Normal file
@ -0,0 +1,83 @@
|
|||||||
|
pipeline {
|
||||||
|
agent {
|
||||||
|
kubernetes {
|
||||||
|
yamlFile '.jenkins/podTemplate.yaml'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
environment {
|
||||||
|
ACR_NAME = 'marcin00'
|
||||||
|
CLIENT_ID = 'c302726f-fafb-4143-94c1-67a70975574a'
|
||||||
|
DOCKER_REGISTRY_URL = 'marcin00.azurecr.io'
|
||||||
|
DOCKER_IMAGE = "${DOCKER_REGISTRY_URL}/user-microservice:${GIT_COMMIT}"
|
||||||
|
DEPLOY_REPO = 'https://gitea.marcin00.pl/pikram/user-microservice-deploy.git'
|
||||||
|
}
|
||||||
|
|
||||||
|
stages {
|
||||||
|
stage('Code Tests') {
|
||||||
|
steps {
|
||||||
|
container('python') {
|
||||||
|
dir('api') {
|
||||||
|
sh '''
|
||||||
|
python3 -m venv env
|
||||||
|
source env/bin/activate
|
||||||
|
pip install -r requirements.txt pytest
|
||||||
|
python3 -m pytest --junit-xml=pytest_junit.xml
|
||||||
|
'''
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
post {
|
||||||
|
always {
|
||||||
|
junit testResults: '**/*pytest_junit.xml'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Build & Push Docker') {
|
||||||
|
steps {
|
||||||
|
container('docker') {
|
||||||
|
sh '''
|
||||||
|
docker build -t ${DOCKER_IMAGE} .
|
||||||
|
az login --identity --client-id ${CLIENT_ID}
|
||||||
|
az acr login --name ${ACR_NAME}
|
||||||
|
docker push ${DOCKER_IMAGE}
|
||||||
|
'''
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
stage('Commit new version to GitOps repo') {
|
||||||
|
steps {
|
||||||
|
container('git') {
|
||||||
|
sh '''
|
||||||
|
git config --global user.name "jenkins[bot]"
|
||||||
|
git config --global user.email "jenkins@marcin00.pl"
|
||||||
|
'''
|
||||||
|
sh 'git clone ${DEPLOY_REPO} --branch jenkins-kubernetes'
|
||||||
|
dir('user-microservice-deploy') {
|
||||||
|
sh '''
|
||||||
|
# Podmień tag obrazu w pliku deploy.yaml
|
||||||
|
awk -v commit="ssh-creds-id$GIT_COMMIT" '
|
||||||
|
$0 ~ /name:[[:space:]]*api/ { in_api_container = 1; print; next }
|
||||||
|
in_api_container && $0 ~ /^[[:space:]]*image:[[:space:]]*/ {
|
||||||
|
sub(/:[^:[:space:]]+$/, ":" commit)
|
||||||
|
in_api_container = 0
|
||||||
|
print
|
||||||
|
next
|
||||||
|
}
|
||||||
|
{ print }
|
||||||
|
' deploy.yaml > deploy.tmp && mv deploy.tmp deploy.yaml
|
||||||
|
'''
|
||||||
|
sh 'git commit -am "JENKINS: Changed deployed version to $GIT_COMMIT"'
|
||||||
|
sshagent(['gitea-deploy-key']) {
|
||||||
|
sh '''
|
||||||
|
git remote set-url origin ssh://git@srv22.mikr.us:20343/pikram/user-microservice-deploy.git
|
||||||
|
git push
|
||||||
|
'''
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
60
.jenkins/podTemplate.yaml
Normal file
60
.jenkins/podTemplate.yaml
Normal file
@ -0,0 +1,60 @@
|
|||||||
|
apiVersion: v1
|
||||||
|
kind: Pod
|
||||||
|
metadata:
|
||||||
|
annotations:
|
||||||
|
io.kubernetes.cri-o.userns-mode: "auto:size=65536"
|
||||||
|
labels:
|
||||||
|
jenkins: "slave"
|
||||||
|
jenkins/label: "kubernetes-agent"
|
||||||
|
spec:
|
||||||
|
runtimeClassName: sysbox-runc
|
||||||
|
containers:
|
||||||
|
- name: jnlp
|
||||||
|
image: jenkins/inbound-agent:alpine
|
||||||
|
tty: false
|
||||||
|
workingDir: /home/jenkins/agent
|
||||||
|
volumeMounts:
|
||||||
|
- name: workspace-volume
|
||||||
|
mountPath: /home/jenkins/agent
|
||||||
|
env:
|
||||||
|
- name: JENKINS_WEB_SOCKET
|
||||||
|
value: "true"
|
||||||
|
- name: REMOTING_OPTS
|
||||||
|
value: "-noReconnectAfter 1d"
|
||||||
|
|
||||||
|
- name: python
|
||||||
|
image: python:3.11.7-alpine
|
||||||
|
command:
|
||||||
|
- cat
|
||||||
|
tty: true
|
||||||
|
workingDir: /home/jenkins/agent
|
||||||
|
volumeMounts:
|
||||||
|
- name: workspace-volume
|
||||||
|
mountPath: /home/jenkins/agent
|
||||||
|
|
||||||
|
- name: docker
|
||||||
|
image: marcin00.azurecr.io/azure-cli-docker:slim-bookworm
|
||||||
|
tty: true
|
||||||
|
workingDir: /home/jenkins/agent
|
||||||
|
volumeMounts:
|
||||||
|
- name: workspace-volume
|
||||||
|
mountPath: /home/jenkins/agent
|
||||||
|
|
||||||
|
- name: git
|
||||||
|
image: alpine/git:latest
|
||||||
|
command:
|
||||||
|
- cat
|
||||||
|
tty: true
|
||||||
|
workingDir: /home/jenkins/agent
|
||||||
|
volumeMounts:
|
||||||
|
- name: workspace-volume
|
||||||
|
mountPath: /home/jenkins/agent
|
||||||
|
|
||||||
|
nodeSelector:
|
||||||
|
kubernetes.io/os: linux
|
||||||
|
|
||||||
|
restartPolicy: Never
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
- name: workspace-volume
|
||||||
|
emptyDir: {}
|
@ -3,7 +3,7 @@ from flask_jwt_extended import get_jwt_identity
|
|||||||
from models import User, db
|
from models import User, db
|
||||||
import os
|
import os
|
||||||
from sqlalchemy import text
|
from sqlalchemy import text
|
||||||
from sqlalchemy.exc import DatabaseError
|
from sqlalchemy.exc import DatabaseError, InterfaceError
|
||||||
import time
|
import time
|
||||||
from werkzeug.security import generate_password_hash
|
from werkzeug.security import generate_password_hash
|
||||||
|
|
||||||
@ -41,7 +41,7 @@ def wait_for_db(max_retries):
|
|||||||
connection.execute(text("SELECT 1"))
|
connection.execute(text("SELECT 1"))
|
||||||
db_ready = True
|
db_ready = True
|
||||||
return
|
return
|
||||||
except DatabaseError:
|
except DatabaseError | InterfaceError:
|
||||||
time.sleep(3)
|
time.sleep(3)
|
||||||
raise Exception("Failed to connect to database.")
|
raise Exception("Failed to connect to database.")
|
||||||
|
|
||||||
|
@ -2,6 +2,7 @@ from flask import Blueprint, jsonify, request, abort
|
|||||||
from flask_jwt_extended import create_access_token, set_access_cookies, jwt_required, \
|
from flask_jwt_extended import create_access_token, set_access_cookies, jwt_required, \
|
||||||
verify_jwt_in_request, get_jwt_identity, unset_jwt_cookies, get_jwt
|
verify_jwt_in_request, get_jwt_identity, unset_jwt_cookies, get_jwt
|
||||||
from models import db, RevokedToken, User
|
from models import db, RevokedToken, User
|
||||||
|
import os
|
||||||
from utils import admin_required, validate_access, get_user_or_404
|
from utils import admin_required, validate_access, get_user_or_404
|
||||||
from werkzeug.security import check_password_hash, generate_password_hash
|
from werkzeug.security import check_password_hash, generate_password_hash
|
||||||
|
|
||||||
@ -110,3 +111,10 @@ def user_logout():
|
|||||||
response = jsonify({"msg": "User logged out successfully."})
|
response = jsonify({"msg": "User logged out successfully."})
|
||||||
unset_jwt_cookies(response)
|
unset_jwt_cookies(response)
|
||||||
return response
|
return response
|
||||||
|
|
||||||
|
@user_bp.route('/version', methods=['GET'])
|
||||||
|
def version():
|
||||||
|
return jsonify({
|
||||||
|
"version": os.getenv("APP_VERSION", "unknown"),
|
||||||
|
"build_time": os.getenv("BUILD_DATE", "unknown")
|
||||||
|
})
|
Reference in New Issue
Block a user