Skip to content

Commit

Permalink
fix: naloga 05
Browse files Browse the repository at this point in the history
  • Loading branch information
HlisTilen committed Dec 9, 2024
1 parent 6d3d1ad commit 126a417
Show file tree
Hide file tree
Showing 4 changed files with 222 additions and 22 deletions.
Binary file added .DS_Store
Binary file not shown.
43 changes: 37 additions & 6 deletions .github/workflows/frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,41 @@ jobs:
name: frontend-coverage
path: 04_DevOps_Deploying/primer/frontend/coverage/

# Gradnja Docker slike in nalaganje na Docker Hub
dockerize-and-push:
needs: test-frontend # Izvede se po uspešnem testiranju
# Gradnja Docker slike in nalaganje na Docker Hub - Development
dockerize-and-push-dev:
needs: test-frontend
runs-on: ubuntu-latest
environment: Development
if: github.ref == 'refs/heads/main' # Ensure this job only runs on the main branch

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Login to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_TOKEN }}

- name: Build Docker image
run: |
docker build -t ${{ secrets.DOCKER_USERNAME }}/frontend:dev ./04_DevOps_Deploying/primer/frontend
docker tag ${{ secrets.DOCKER_USERNAME }}/frontend:dev ${{ secrets.DOCKER_USERNAME }}/frontend:${{ github.sha }}
- name: Push Docker image to Docker Hub
run: |
docker push ${{ secrets.DOCKER_USERNAME }}/frontend:dev
docker push ${{ secrets.DOCKER_USERNAME }}/frontend:${{ github.sha }}
# Gradnja Docker slike in nalaganje na Docker Hub - Production
dockerize-and-push-prod:
needs: test-frontend
runs-on: ubuntu-latest
environment:
name: Production
url: https://example-production.com
if: github.ref == 'refs/heads/production' # Ensure this job only runs on the production branch

steps:
- name: Checkout code
Expand All @@ -101,12 +132,12 @@ jobs:

- name: Build Docker image
run: |
docker build -t ${{ secrets.DOCKER_USERNAME }}/frontend:latest ./04_DevOps_Deploying/primer/frontend
docker tag ${{ secrets.DOCKER_USERNAME }}/frontend:latest ${{ secrets.DOCKER_USERNAME }}/frontend:${{ github.sha }}
docker build -t ${{ secrets.DOCKER_USERNAME }}/frontend:prod ./04_DevOps_Deploying/primer/frontend
docker tag ${{ secrets.DOCKER_USERNAME }}/frontend:prod ${{ secrets.DOCKER_USERNAME }}/frontend:${{ github.sha }}
- name: Push Docker image to Docker Hub
run: |
docker push ${{ secrets.DOCKER_USERNAME }}/frontend:latest
docker push ${{ secrets.DOCKER_USERNAME }}/frontend:prod
docker push ${{ secrets.DOCKER_USERNAME }}/frontend:${{ github.sha }}
# Deploy na Firebase Hosting
Expand Down
19 changes: 14 additions & 5 deletions 05_DevOps_Environments/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# 📝 Vaja: GitHub Pages in Environments
# 📝 Vaja: GitHub Pages in environments

## 📑 Namen vaje
Cilj te vaje je, da se študenti naučijo uporabljati **GitHub Pages** za uvajanje statične spletne strani z opisom projekta in nastaviti **environments** za razlikovanje med testnimi in produkcijskimi okolji.
Expand Down Expand Up @@ -30,8 +30,15 @@ Cilj te vaje je, da se študenti naučijo uporabljati **GitHub Pages** za uvajan
- Ustvarite dva okolja v GitHub **Environments**:
- **Development**:
- Uporablja se za testne namestitve.
- Docker slika mora biti označena z oznako dev.
- Slika mora biti objavljena na Docker Hub.

- **Production**:
- Uporablja se za končne namestitve in zahteva ročno odobritev.
- Docker slika mora biti označena z oznako prod.
- Slika mora biti objavljena na Docker Hub.
- Zahteva ročno odobritev.

- V cevovodu nastavite, da se spremembe iz veje `main` nameščajo na okolje Development, medtem ko se spremembe iz veje `production` nameščajo na Production.

---
Expand All @@ -54,16 +61,18 @@ Za primer implementacije si oglejte primer aplikacije v repozitoriju in primer c

## 🔄 Povzetek naloge
1. **Dodajte fazo uvajanja na GitHub Pages**.
2. **Nastavite environments** (Development in Production).
2. **Nastavite environments** (Development in Production).
3. **Dodajte fazo za objavo** Docker slik na Docker Hub.

---

## 🔍 Ocenjevanje

1. **GitHub Pages (40%)**
1. **GitHub Pages (30%)**
- Statična stran je pravilno objavljena.

2. **Environments (60%)**
- Development in Production sta pravilno nastavljena.
2. **Environments (70%)**
- Development in Production sta pravilno nastavljena.
- Docker hub: slike so pravilno objavljene.

---
182 changes: 171 additions & 11 deletions docs/index.html
Original file line number Diff line number Diff line change
@@ -1,26 +1,186 @@
<!DOCTYPE html>
<html lang="en">
<html lang="sl">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>My Project</title>
<title>RIRS - Razvoj informacijskih rešitev in storitev</title>
<style>
/* General Reset */
* {
margin: 0;
padding: 0;
box-sizing: border-box;
}

/* Body Styling */
body {
font-family: Arial, sans-serif;
font-family: 'Arial', sans-serif;
line-height: 1.6;
background-color: #1a1a2e;
color: #eaeaea;
margin: 0;
}

/* Header Section */
header {
background-color: #16213e;
padding: 40px 20px;
text-align: center;
color: #ffffff;
}

header h1 {
font-size: 2.5em;
margin-bottom: 10px;
}

header p {
font-size: 1.2em;
color: #a6dcef;
}

/* Navigation */
nav {
background-color: #0f3460;
padding: 15px;
position: sticky;
top: 0;
z-index: 1000;
}

nav ul {
display: flex;
justify-content: center;
list-style: none;
}

nav ul li {
margin: 0 15px;
}

nav ul li a {
color: #eaeaea;
text-decoration: none;
font-weight: bold;
padding: 10px 15px;
border-radius: 5px;
transition: background-color 0.3s ease;
}

nav ul li a:hover {
background-color: #a6dcef;
color: #0f3460;
}

/* Main Content */
main {
padding: 30px 20px;
max-width: 1200px;
margin: 0 auto;
}

section {
margin-bottom: 40px;
}

section h2 {
font-size: 2em;
color: #f4a261;
margin-bottom: 20px;
}

.card {
background-color: #16213e;
padding: 20px;
border-radius: 10px;
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
margin-bottom: 20px;
}

.card ul {
list-style: disc;
margin-left: 20px;
}

.card a {
color: #a6dcef;
text-decoration: none;
transition: color 0.3s ease;
}

.card a:hover {
color: #f4a261;
}

/* Footer */
footer {
background-color: #0f3460;
color: #eaeaea;
text-align: center;
padding: 50px;
padding: 20px;
margin-top: 30px;
font-size: 0.9em;
}
h1 {
color: #333;

footer a {
color: #a6dcef;
text-decoration: none;
}
p {
color: #666;

footer a:hover {
color: #f4a261;
}
</style>
</head>
<body>
<h1>Welcome to My Project</h1>
<p>This is a simple project description for the GitHub Pages example.</p>
<p>Created by <strong>Your Name</strong>.</p>
<header>
<h1>RIRS</h1>
<p>Razvoj informacijskih rešitev in storitev</p>
</header>
<nav>
<ul>
<li><a href="#introduction">Dobrodošli</a></li>
<li><a href="#structure">Struktura</a></li>
<li><a href="#support">Podpora</a></li>
<li><a href="#faq">Pogosta vprašanja</a></li>
</ul>
</nav>
<main>
<section id="introduction">
<h2>📘 Dobrodošli</h2>
<div class="card">
<p>Dobrodošli v repozitoriju predmeta <strong>RIRS</strong> (Razvoj informacijskih rešitev in storitev), ki bo služil kot glavna platforma za izvajanje vaj in shranjevanje učnih materialov med semestrom.</p>
</div>
</section>
<section id="structure">
<h2>📂 Struktura repozitorija</h2>
<div class="card">
<p>Repozitorij je organiziran po sklopih vaj, ki jih bomo izvajali tekom semestra. Vsak sklop bo vseboval potrebne vire, kodo in navodila za izvedbo nalog.</p>
<ul>
<li><strong>/01_vaja:</strong> Vaja 1 - [🔍 Kratek opis vsebine vaje]</li>
<li><strong>/02_vaja:</strong> Vaja 2 - [🔍 Kratek opis vsebine vaje]</li>
<li><strong>...</strong></li>
</ul>
</div>
</section>
<section id="support">
<h2>💬 Prispevanje in podpora</h2>
<div class="card">
<p>V primeru težav ali vprašanj se obrnite na <a href="mailto:[email protected]">[email protected]</a> ali pa ustvarite <strong>issue</strong> tukaj na GitHubu.</p>
</div>
</section>
<section id="faq">
<h2>❓ Pogosta vprašanja</h2>
<div class="card">
<p><strong>❔ Kaj storim, če ne morem dostopati do vsebine?</strong></p>
<p>Prosimo, preverite, ali imate veljavno GitHub prijavo in dovoljenja za dostop. V primeru težav kontaktirajte asistenta.</p>
<p><strong>📤 Kako oddam nalogo?</strong></p>
<p>Naloge bodo ocenjene na vašem lastnem repozitoriju.</p>
</div>
</section>
</main>
<footer>
<p>🚀 Želimo vam uspešno delo in veliko novih znanj pri predmetu <strong>RIRS</strong>!</p>
</footer>
</body>
</html>

0 comments on commit 126a417

Please sign in to comment.