Pull iz Jan563 v sebitsi

ProjektPoste/Dockerfile

@@ -0,0 +1,7 @@
+FROM nginx:alpine
+
+COPY nginx.conf /etc/nginx/nginx.conf
+
+WORKDIR /usr/share/nginx/html
+COPY dist/ProjektPoste/ .
+

ProjektPoste/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://dev.azure.com/sebit-test/TestingAzure/_apis/build/status/Jan563.AngularTest?branchName=master)](https://dev.azure.com/sebit-test/TestingAzure/_build/latest?definitionId=1&branchName=master)
+
 # ProjektPoste
 
 This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.2.1.
@@ -25,3 +27,4 @@ Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protrac
 ## Further help
 
 To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
+ aaaargd

ProjektPoste/deploy.ps1

@@ -0,0 +1,10 @@
+$dir = Split-Path $MyInvocation.MyCommand.Path
+Push-Location $dir
+
+npm i -g firebase-tools
+write-host "starting deploy...";
+firebase --version;
+firebase deploy --token "1/5DTQvFZGLxga-T1xrgvrfbnnbc6nnMk2LV9FCVqZpH0" --project "my-test-project-c4ce1" --message "Release: 1.0" --only hosting;
+write-host "deployment completed";
+
+Pop-Location

ProjektPoste/firebase.json

@@ -1,15 +1,15 @@
 {
   "hosting": {
-    "public": "dist",
+    "public": "src",
     "ignore": [
       "firebase.json",
       "**/.*",
       "**/node_modules/**"
     ],
     "rewrites": [
       {
-        "source": "**", // projektPoste here ??? 
-        "destination": "/index.html"
+        "source": "**",
+        "destination": "/README.html"
       }
     ]
   },

ProjektPoste/nginx.conf

@@ -0,0 +1,25 @@
+worker_processes  1;
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    server {
+        listen 80;
+        server_name  localhost;
+
+        root   /usr/share/nginx/html;
+        index  index.html index.htm;
+        include /etc/nginx/mime.types;
+
+        gzip on;
+        gzip_min_length 1000;
+        gzip_proxied expired no-cache no-store private auth;
+        gzip_types text/plain text/css application/json application/javascript application/x-javascript text/xml application/xml application/xml+rss text/javascript;
+
+        location / {
+            try_files $uri $uri/ /index.html;
+        }
+    }
+}

ProjektPoste/src/app/vaja1/dva/dva.component.html

@@ -1,5 +1,7 @@
 <div style=" margin-left: 20px">
   <p >
     dva works!
+    krneki
+    alestorm
   </p>
 </div>

ProjektPoste/src/app/vaja1/dva/dva.component.ts

@@ -1,20 +1,16 @@
 import { Component, OnInit } from '@angular/core';
-import { AngularFireFunctions } from '@angular/fire/functions';
-import { Observable } from 'rxjs';
+
 
 @Component({
   selector: 'app-dva',
-  template: `{{ data$  | async }}`,
+  templateUrl: './dva.component.html',
   styleUrls: ['./dva.component.css']
 })
 export class DvaComponent implements OnInit {
 
-data$: Observable<string>;
 
-  constructor(private fns: AngularFireFunctions) { 
-    // const cors = require('cors')({origin: true});
-    const callable = fns.httpsCallable('helloWorld');
-    this.data$ = callable({ name: 'Jan'});
+
+  constructor() { 
   }
 
   ngOnInit() {

ProjektPoste/test.md

@@ -0,0 +1,3 @@
+#### Test page
+
+Works

README.md

@@ -1 +1,90 @@
-# AngularTest
+{body|s}
+
+# Navodila za postavitev
+
+V prvi fazi je potrebno v Azure postaviti Kubernetes service, ki nam omogoča izvajanje kubernetes komand v 'cmd' prompt ter vpogled v dashboard z navodili, ki so na njihovi strani.
+Za testiranje napišemo v command prompt 'kubectl'.
+### 'Build' faza
+Nato se povežemo na Azure DevOps, kjer najdemo zavihek Pipelines. Pod zavihkom 'builds' se prvo povežemo na naš GitHub repozitorij in določimo tip proženja (ob vsaki spremembi, ročno). Agent pool naj bo tipa **Hosted Ubuntu**. Nato pod prvim in edinim Agent Job začnemo nizati taske:
+1. **Use Node 8.x** (Inštalacija poljubne verzije Node.js)
+2. **Command line** (V njem naredimo production build, torej:)
+      - *npm install -g @angular/cli
+        cd ./ProjektPoste
+        npm install
+        ng build --prod
+        echo Production build finished!*
+2. **Docker login** (Pri čemer naredimo service connection
+   Primer Image name: *janp110191/jan-repo:$(Build.BuildId)*)
+3. **Docker build** (Naša mapa, ki jo z Gita vlečemo, naj ima Dockerfile, v katerem je določeno katere datoteke se vključijo v naš build.)
+4. **Docker tag** (Kopiramo Image name iz Docker build taska)
+5. **Docker push** (Upload v določen repozitorij. Login je potreben za to fazo. Kopiramo zopet Image name od zgoraj.)
+
+Pri vseh docker taskih potrebujemo delujoč service connection.
+
+Agent Job naj bo linux, saj so v primeru Windows bile neke komplikacije.
+
+![Build slika](https://i.imgur.com/4UP3vvW.png)
+
+### 'Release' faza
+Nato skočimo v 'Releases' zavihek, kjer ustvarimo nov release in kot artifact določimo ta build. V proženju lahko izberemo, ali se release izvaja ročno ali avtomatsko po uspešno končanem buildu.
+Pri release imamo dva načina postavitve storitve:
+1. **Tekstovni ukazi**
+   S tem primerom postavimo Kubernetesu argumenete kar v command line. Naredimo dva **'Deploy to Kubernetes'** tasks na Agent jobu, pri čemer je prvi **run** in drugi **expose**. Task naredi '*kubectl run/expose*' del, mi pa ostalo v Arguments.
+   Pri 'run' so argumenti takšni:
+   - $(Release.ReleaseId) --image=janp110191/jan-repo:$(Build.BuildId) --port=80
+   - Pri **expose** pa: deployment $(Release.ReleaseId) --name=service-$(Release.ReleaseId) --type=LoadBalancer --port=3000 --target-port=80
+
+![Build slika](https://i.imgur.com/NDnZjIH.png)
+
+2. **YAML navodili**
+  S tem primerom naredimo enako '*Deploy to Kubernetes*' task, v katerem uporabimo '**apply**'. Tam kličemo našo YAML datoteko, ki bi jo vključili v naš GitHub repozitorij. (YAML mora vsebovati navodila za deployment in service tipa LoadBalancer)
+  Ker YAML ne dopušča dinamičnih zunanjih spremenljivk, z še enim '**set**' taskom popravimo image na najnoveji:
+   - kubectl set deployment (ime) --image janp110191/jan-repo:$(Build.BuildId)
+
+V obeh primerih pazimo, da so porti pravilno konfigurirani glede na image, ki ga uporabljamo. Servis pa mora biti tipa '*LoadBalancer*' [Dodatna navodila so tu.](https://blog.jreypo.io/containers/microsoft/azure/cloud/cloud-native/how-to-expose-your-kubernetes-workloads-on-azure/)
+
+Na Kubernetes dashboardu bi sedaj morali videti naš deployment in toliko podov, kolikor smo jih definirali. Servis bi moral biti z statusom 'pending' za kratek čas, preden se mu dodeli External IP in je aplikacija dosegljiva.
+
+#### Kubernetes (kubectl) ukazi
+Kubernetes nam ponuja dostop poleg dashboarda tudi v command promptu, kjer ima vedno pripono '**kubectl**'. 
+- ##### Yaml
+  Za poganjanje naših .yaml datotek, ki definirajo različne stvari v Kubernetesu uporabljamo:
+  1. *kubectl create -f (datoteka)*
+  2. *kubectl apply -f (datoteka)*
+
+  'Create' uporabljamo le, kadar ne nameravamo storitve v prihodnosti nikoli spreminjati - če hočemo spremenljivo verzijo, ga vedno ustvarimo kar z 'apply'.
+- ##### Ogled storitev
+  Če si hočemo ogledati listo storitev katerega tipa ali pa le eno v podrobnosti, uporabimo:
+  1. *kubectl get (deployments, services, pods, persistentVolumes, itd.) (ime_storitve(ni obvezno))*
+  2. *kubectl describe (deployment, service, pod, itd.) (ime_storitve(ni obvezno))*
+  3. *kubectl run (za ročno ustvarjanje deploymentov in drugi storitev*)
+
+#### YAML
+Kreiranje osnovnega deploymenta:
+
+![Slika deploy](https://github.com/Jan563/AngularTest/blob/master/pic3.PNG)
+
+Kreiranje servisa za nek deployment:
+
+![Slika deploy](https://github.com/Jan563/AngularTest/blob/master/pic4.PNG)
+
+**Persistent volumes**
+
+![Slika deploy](https://github.com/Jan563/AngularTest/blob/master/volume1.PNG)
+
+Kot se vidi na sliki, potrebujemo za persistent volume deployment, Persistent Volume claim zanj, Storage Class, Persistent volume sam in pa secret.
+Postopek je bolje opisan [na tem linku](https://pascalnaber.wordpress.com/2018/01/26/persistent-storage-and-volumes-using-kubernetes-on-azure-with-aks-or-azure-container-service/)*(pod 'Static Persistent Volume')*
+
+#### Viri:
+  - [Video z podobnimi koraki](https://www.youtube.com/watch?v=K4uNl6JA7g8)
+  - [Blog z navodili (na koncu vključuje Helm)](https://medium.com/@timfpark/application-ci-cd-on-kubernetes-with-visual-studio-team-services-ccacecdea8a5)
+
+
+  [Test link](/ProjektPoste/src/test.html)
+
+
+  [Test link 2](/ProjektPoste/test.md)
+
+  [Test link 3](/ProjektPoste/src/test.md)
+
+  [Test link 4](/ProjektPoste/test.html)

azure-pipelines.yml

@@ -0,0 +1,62 @@
+# Node.js with Angular
+# Build a Node.js project that uses Angular.
+# Add steps that analyze code, save build artifacts, deploy, and more:
+# https://docs.microsoft.com/azure/devops/pipelines/languages/javascript
+
+trigger:
+- master
+
+pool:
+  vmImage: 'Ubuntu-16.04'
+  # vmImage: 'Hosted VS2017'
+
+steps:
+- task: NodeTool@0
+  inputs:
+    versionSpec: '8.x'
+  displayName: 'Install Node.js'
+
+- script: |
+    npm install -g @angular/cli
+    cd ./ProjektPoste
+    npm install
+    ng build --prod
+  displayName: 'npm install, build and test'
+
+- powershell: gci env:* | sort-object name | Format-Table -AutoSize | Out-File $env:BUILD_ARTIFACTSTAGINGDIRECTORY/environment-variables.txt
+
+- task: PublishBuildArtifacts@1
+  inputs:
+    pathtoPublish: '$(Build.ArtifactStagingDirectory)'
+    artifactName: drop
+
+- task: PublishBuildArtifacts@1
+  displayName: 'Publish Firebase.json'
+  inputs:
+    PathtoPublish: ProjektPoste/firebase.json
+    ArtifactName: drop
+
+- task: PublishBuildArtifacts@1
+  displayName: 'Publish deploy ps1'
+  inputs:
+    PathtoPublish: ProjektPoste/deploy.ps1
+    ArtifactName: drop
+
+
+# - task: CopyFiles@2
+#   inputs:
+#     contents: '_buildOutput\ProjektPoste\dist\**'
+#     targetFolder: $(Build.ArtifactStagingDirectory)
+
+- task: PublishBuildArtifacts@1
+  displayName: 'Publish Build'
+  inputs:
+    PathtoPublish: ProjektPoste/dist
+    ArtifactName: drop
+    publishLocation: FilePath
+    TargetPath: dist
+
+
+            # tu odstranimo drop in zgoraj odstranimo dist
+
+            #######s dfsesfsd

azure-pipelines2.yml

@@ -0,0 +1,62 @@
+# Node.js with Angular
+# Build a Node.js project that uses Angular.
+# Add steps that analyze code, save build artifacts, deploy, and more:
+# https://docs.microsoft.com/azure/devops/pipelines/languages/javascript
+
+trigger:
+- master
+
+# pool:
+#   vmImage: 'Ubuntu-16.04'
+#   # vmImage: 'Hosted VS2017'
+
+steps:
+- task: NodeTool@0
+  inputs:
+    versionSpec: '8.x'
+  displayName: 'Install Node.js'
+
+# - script: |
+#     npm install -g @angular/cli
+#     cd ./ProjektPoste
+#     npm install
+#     ng build --prod
+#   displayName: 'npm install and build'
+
+- powershell: gci env:* | sort-object name | Format-Table -AutoSize | Out-File $env:BUILD_ARTIFACTSTAGINGDIRECTORY/environment-variables.txt
+
+- task: PublishBuildArtifacts@1
+  inputs:
+    pathtoPublish: '$(Build.ArtifactStagingDirectory)'
+    artifactName: drop
+
+- task: PublishBuildArtifacts@1
+  displayName: 'Publish Firebase.json'
+  inputs:
+    PathtoPublish: ProjektPoste/angular.json
+    ArtifactName: drop
+
+- task: PublishBuildArtifacts@1
+  displayName: 'Publish deploy ps1'
+  inputs:
+    PathtoPublish: ProjektPoste/src/assets/images/noimg.jpeg
+    ArtifactName: drop
+    publishLocation: FilePath
+    TargetPath: src/assets/images
+
+
+# - task: CopyFiles@2
+#   inputs:
+#     contents: '_buildOutput\ProjektPoste\dist\**'
+#     targetFolder: $(Build.ArtifactStagingDirectory)
+
+# - task: PublishBuildArtifacts@1
+#   displayName: 'Publish Build'
+#   inputs:
+#     PathtoPublish: ProjektPoste/dist
+#     ArtifactName: drop
+#     publishLocation: FilePath
+#     TargetPath: dist
+
+
+            # tu odstranimo drop in zgoraj odstranimo dist

composetest/docker-compose.yml

@@ -0,0 +1,6 @@
+version: '3'
+services:
+  test:
+    image: janp110191/jan-repo:${APP_IMAGE}
+    ports:
+      - "3015:80"

composetest/powershell.ps1

@@ -0,0 +1,16 @@
+param (
+    [string]$imageIdName = "275",
+    [string]$artifactPath = "_containertest/drop/"
+
+ )
+
+Write-Host $PSScriptRoot
+
+cd\
+cd $Env:SYSTEM_DEFAULTWORKINGDIRECTORY\$artifactPath
+
+$Env:APP_IMAGE = "$imageIdName"
+
+docker-compose up -d
+
+echo Done!