Compare commits

..

11 Commits

Author SHA1 Message Date
feeb4e665c Merge pull request 'remove paths' (#13) from dev into main
Reviewed-on: #13
2025-06-06 13:53:50 +03:00
2718229461 Merge pull request 'fix naming' (#12) from dev into main
Reviewed-on: #12
2025-06-06 13:52:27 +03:00
c9cb6f1099 Merge pull request 'dev' (#11) from dev into main
Reviewed-on: #11
2025-06-06 13:44:51 +03:00
0c90dddf05 Merge pull request 'dev' (#10) from dev into main
Reviewed-on: #10
2025-06-06 13:34:10 +03:00
633b32b222 Merge pull request 'dev' (#8) from dev into main
Reviewed-on: #8
2025-06-06 12:03:13 +03:00
486f5d325d Merge pull request 'dev' (#7) from dev into main
Reviewed-on: #7
2025-06-06 11:19:09 +03:00
a0a193babc Merge pull request 'fix network name' (#6) from dev into main
Reviewed-on: #6
2025-06-06 00:53:06 +03:00
33f13931dc Merge pull request 'dev' (#5) from dev into main
Reviewed-on: #5
2025-06-06 00:33:56 +03:00
ea4486c8ea Merge pull request 'Docker build' (#4) from dev into main
Reviewed-on: #4
2025-06-05 23:48:58 +03:00
4a14a6cf48 Merge pull request 'dev test' (#3) from dev into main
Reviewed-on: #3
2025-06-05 23:36:24 +03:00
c6d2e6a9d3 Merge pull request 'dev' (#2) from dev into main
Reviewed-on: #2
2025-06-05 23:09:25 +03:00
4 changed files with 1 additions and 54 deletions

View File

@@ -1,16 +0,0 @@
name: Deploy on server
on:
workflow_dispatch:
jobs:
Deploy:
name: Deploy
runs-on: ubuntu-latest
steps:
- name: Trigger Jenkins jobs
uses: appleboy/jenkins-action@master
with:
url: "http://ci.saccada.xyz"
user: ${{ env.JENKINS_USERNAME }}
token: ${{ secrets.JENKINS_TOKEN }}
job: "Deploy Django application"

36
Jenkinsfile vendored
View File

@@ -1,36 +0,0 @@
pipeline {
agent any
stages {
stage('Hello') {
steps {
echo 'Hello from Jenkins'
}
}
stage('Connect to server') {
steps {
withCredentials([
sshUserPrivateKey(
credentialsId: '73d234d2-3f9d-44e9-97fc-b6317070b462',
keyFileVariable: 'SSH_PRIVATE_KEY'
)
]) {
sh '''#!/bin/bash
ssh -i "$SSH_PRIVATE_KEY" -p 2222 saccada@saccada.xyz << EOF
cd ~/ws/django-example-app
git pull --rebase
docker compose pull
docker compose down
docker compose up -d
'''
}
}
}
}
post {
always {
sleep 5
}
}
}

View File

@@ -4,4 +4,4 @@ Application made by django's instruction for **DevOps** education purposes
# Pylint # Pylint
![pylint](https://img.shields.io/badge/PyLint-6.22-orange?logo=python&logoColor=white) ![pylint](https://img.shields.io/badge/PyLint-6.20-orange?logo=python&logoColor=white)

View File

@@ -26,7 +26,6 @@ SECRET_KEY = os.getenv("DJANGO_SECRET_KEY")
# SECURITY WARNING: don't run with debug turned on in production! # SECURITY WARNING: don't run with debug turned on in production!
DEBUG = False DEBUG = False
CSRF_TRUSTED_ORIGINS = ["https://app.saccada.xyz"]
ALLOWED_HOSTS = ["localhost", "app.saccada.xyz"] ALLOWED_HOSTS = ["localhost", "app.saccada.xyz"]