ionelcataon/it_school
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

p2

Browse Source
This commit is contained in:
Ionel Andrei Cataon
2026-02-12 17:07:52 +02:00
parent 3d25479a5c
commit dbdcb575df
3 changed files with 22 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
project2/Dockerfile
View File

@@ -8,5 +8,4 @@ COPY famousquotes.py .
RUN touch quote.txt && chmod 666 quote.txt RUN touch quote.txt && chmod 666 quote.txt
# Comanda de rulare
CMD ["python", "famousquotes.py"] CMD ["python", "famousquotes.py"]

39
project2/famousquotes.py
View File

@@ -1,37 +1,22 @@
import requests import requests
import os
import sys
import random
API_URL = os.getenv("QUOTE_API_URL", "https://api.adviceslip.com/advice")
def get_quote(): def get_quote():
# Citate de rezervă în caz că rețeaua pică
fallback_quotes = [
{"q": "The only way to do great work is to love what you do.", "a": "Steve Jobs"},
{"q": "Innovation distinguishes between a leader and a follower.", "a": "Steve Jobs"},
{"q": "Stay hungry, stay foolish.", "a": "Steve Jobs"}
]
try: try:
# Încercăm să luăm de pe net (timeout mic să nu așteptăm mult) # Folosim API-ul Quotable pentru a primi și autorul
response = requests.get(API_URL, timeout=5) response = requests.get("https://api.quotable.io/random", timeout=10)
response.raise_for_status() response.raise_for_status()
data = response.json() data = response.json()
if 'slip' in data: quote = data.get('content', 'No quote found')
quote, author = data['slip'].get('advice'), "AdviceSlip" author = data.get('author', 'Unknown')
else:
quote = data.get('content') or data.get('q') # Salvăm formatat pentru Discord
author = data.get('author') or data.get('a') or "Unknown" with open("quote.txt", "w", encoding="utf-8") as f:
except Exception: f.write(f"📜 *\"{quote}\"*\n\n✍️ **Autor:** {author}")
# Dacă rețeaua eșuează, alegem unul din listă
choice = random.choice(fallback_quotes) except Exception as e:
quote, author = choice['q'], choice['a'] with open("quote.txt", "w", encoding="utf-8") as f:
f.write(f"⚠️ Nu am putut prelua citatul. Eroare: {str(e)}")
message = f"📜 *\"{quote}\"* \n\n✍️ **{author}**"
with open("quote.txt", "w", encoding="utf-8") as f:
f.write(message)
if __name__ == "__main__": if __name__ == "__main__":
get_quote() get_quote()

24
project2/jenkinsfile
View File

@@ -20,10 +20,12 @@ pipeline {
dir('project2') { dir('project2') {
sh "docker rm -f quotes-worker || true" sh "docker rm -f quotes-worker || true"
try { try {
sh "docker run --name quotes-worker --dns 8.8.8.8 quotes-app" // Rulăm containerul pentru a genera fișierul
sh "docker run --name quotes-worker quotes-app"
// Copiem rezultatul din container în workspace-ul Jenkins
sh "docker cp quotes-worker:/app/quote.txt ." sh "docker cp quotes-worker:/app/quote.txt ."
} catch (e) { } catch (e) {
echo "⚠️ Eroare la rulare, dar încercăm notificarea." echo "⚠️ Eroare la execuție."
} finally { } finally {
sh "docker rm -f quotes-worker || true" sh "docker rm -f quotes-worker || true"
} }
@@ -38,31 +40,25 @@ pipeline {
script { script {
def discordUrl = "https://discord.com/api/webhooks/1471492658336891013/T5s6ZKZjJjDMHXc3k3jjZdk6m5EV12bKF1wda9d5I_gZJrsDZQ1m1m078IiLJWK38mqa" def discordUrl = "https://discord.com/api/webhooks/1471492658336891013/T5s6ZKZjJjDMHXc3k3jjZdk6m5EV12bKF1wda9d5I_gZJrsDZQ1m1m078IiLJWK38mqa"
def quoteText = "Nu am putut citi fișierul." def quoteContent = "Fișierul cu citate lipsește."
if (fileExists('project2/quote.txt')) { if (fileExists('project2/quote.txt')) {
quoteText = readFile('project2/quote.txt').trim() quoteContent = readFile('project2/quote.txt').trim()
// Escapăm caracterele speciale pentru a nu strica JSON-ul
// CURĂȚARE TEXT: Prevenim stricarea JSON-ului manual quoteContent = quoteContent.replace('\\', '\\\\').replace('"', '\\"').replace('\n', '\\n')
quoteText = quoteText.replace('\\', '\\\\').replace('"', '\\"').replace('\n', '\\n')
} }
def resultStatus = currentBuild.result ?: 'SUCCESS' def resultStatus = currentBuild.result ?: 'SUCCESS'
def statusEmoji = (resultStatus == 'SUCCESS') ? "✅" : "⚠️" def statusEmoji = (resultStatus == 'SUCCESS') ? "✅" : "⚠️"
def buildHeader = "${statusEmoji} **Pipeline Finalizat (Build #${env.BUILD_NUMBER})**" def header = "${statusEmoji} **Pipeline Finalizat (Build #${env.BUILD_NUMBER})**"
echo "🚀 Generăm payload-ul și trimitem către Discord..."
// MODIFICARE CRITICĂ: Înlocuim writeJSON cu 'cat' (Linux native)
sh """ sh """
cat << 'EOF' > discord_payload.json cat << 'EOF' > discord_payload.json
{ {
"content": "${buildHeader}\\n\\n${quoteText}" "content": "${header}\\n\\n${quoteContent}"
} }
EOF EOF
""" """
// Trimitem fișierul JSON brut către Discord
// Folosim --data-binary pentru a păstra formatarea corectă
sh "curl -X POST -H 'Content-Type: application/json' --data-binary @discord_payload.json '${discordUrl}'" sh "curl -X POST -H 'Content-Type: application/json' --data-binary @discord_payload.json '${discordUrl}'"
} }
} }