commit b196b3d80df909ff0d762062deace673894fc1d8 Author: Mihael Janjic Date: Tue Jun 23 12:32:41 2026 +0200 fdirst commit diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..dd3b7cc --- /dev/null +++ b/.dockerignore @@ -0,0 +1,6 @@ +__pycache__/ +*.pyc +.env +.git/ +*.md +k8s/ diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..3919729 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,13 @@ +# TODO: napiši Dockerfile +# Base image: python:3.12-slim +# Working dir: /app +# Kopiraj requirements.txt, pip install, zatim kopiraj app/ +# EXPOSE 8000 +# CMD uvicorn app.main:app --host 0.0.0.0 --port 8000 +FROM python:3.12-slim +WORKDIR /app +COPY requirements.txt . # layer 1 — mijenja se rijetko +RUN pip install --no-cache-dir -r requirements.txt # layer 2 — kesirano +COPY app/ ./app/ # layer 3 — mijenja se cesto +EXPOSE 8000 +CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000"] \ No newline at end of file diff --git a/app/main.py b/app/main.py new file mode 100644 index 0000000..4af1f7f --- /dev/null +++ b/app/main.py @@ -0,0 +1,14 @@ +import os +from fastapi import FastAPI + +app = FastAPI() + +AUTOR = os.getenv("AUTOR", "nepoznat") + +@app.get("/") +def root(): + return {"message": "Kolokvij 2", "autor": AUTOR} + +@app.get("/health") +def health(): + return {"status": "ok"} diff --git a/k8s/deployment.yaml b/k8s/deployment.yaml new file mode 100644 index 0000000..61854f0 --- /dev/null +++ b/k8s/deployment.yaml @@ -0,0 +1,27 @@ +# TODO: napiši Deployment +# Ime: k2-app | Namespace: kolokvij2-IME-PREZIME +# Replicas: 2 | Image: git.fpmoz.sum.ba/IME-PREZIME/k2-app:1.0 +# containerPort: 8000 | env AUTOR=IME-PREZIME +apiVersion: apps/v1 +kind: Deployment +metadata: + name: k2-app + namespace: kolokvij2-mihael-janjic +spec: + replicas: 2 + selector: + matchLabels: + app: k2-app + template: + metadata: + lables: + app: k2-app + spec: + containters: + - name: k2-app + image: git.fpmoz.sum.ba/mihaeljanjic/k2-app:1.0 + ports: + - containerPort: 8000 + env: + - name: AUTOR + value: "Mihael Janjic" \ No newline at end of file diff --git a/k8s/ingress.yaml b/k8s/ingress.yaml new file mode 100644 index 0000000..5ca3732 --- /dev/null +++ b/k8s/ingress.yaml @@ -0,0 +1,22 @@ +# TODO: napiši Ingress +# Ime: k2-ingress | Namespace: kolokvij2-IME-PREZIME +# ingressClassName: traefik +# Host: IME-PREZIME.argocd.fpmoz.sum.ba -> k2-svc:80 +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: k2-ingress + namespace: kolokvij2-mihael-janjic +spec: + ingressClassName: traefik + rules: + - host: mihaeljanjic.argocd.fpmoz.sum.ba + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: k2-svc + port: + number: 80 \ No newline at end of file diff --git a/k8s/service.yaml b/k8s/service.yaml new file mode 100644 index 0000000..bce399a --- /dev/null +++ b/k8s/service.yaml @@ -0,0 +1,16 @@ +# TODO: napiši Service +# Ime: k2-svc | Namespace: kolokvij2-IME-PREZIME +# Tip: ClusterIP | port: 80 -> targetPort: 8000 +apiVersion: v1 +kind: Service +metadata: + name: k2-svc + namespace: kolokvij2-mihael-janjic +spec: + selector: + app: k2-app + ports: + - port: 80 + targetPort: 8000 + protocol: TCP + type: ClusterIP \ No newline at end of file diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..c83aa69 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,2 @@ +fastapi==0.111.0 +uvicorn[standard]==0.29.0