From 7b7f859fbdb6c545a677bad47f07e97a372985fd Mon Sep 17 00:00:00 2001
From: Oleg Sucharevich <oleg2807@gmail.com>
Date: Wed, 13 Jan 2021 09:52:39 +0200
Subject: [PATCH 1/8] update dockerfile

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 33aaea2..8b5eea9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.8
+FROM alpine:3.12.3
 
 RUN apk add --update ca-certificates
 

From 4b8b6f8ccefe7ffe96a483bd9b17e44590e17243 Mon Sep 17 00:00:00 2001
From: Oleg Sucharevich <oleg2807@gmail.com>
Date: Wed, 13 Jan 2021 10:12:48 +0200
Subject: [PATCH 2/8] update codefresh yaml with snyk

---
 VERSION        |  2 +-
 codefresh.yaml | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 54d1a4f..ed0d9e9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.13.0
+0.13.1
\ No newline at end of file
diff --git a/codefresh.yaml b/codefresh.yaml
index 836c576..40633d8 100644
--- a/codefresh.yaml
+++ b/codefresh.yaml
@@ -90,6 +90,17 @@ steps:
         on:
         - success
 
+  scan:
+    title: "Scan image for vulnarabilities"
+    image: snyk/snyk-cli:npm
+    stage: Build & Test
+    commands:
+      - snyk container test --docker codefresh/pikolo:${{VERSION}} --file=Dockerfile
+    when:
+      steps:
+      - name: build
+        on:
+        - success
 
   push_cli_image:
     title: "Push image"

From f57ac35efd00f30554e833fe788fbd7dd43bd166 Mon Sep 17 00:00:00 2001
From: Oleg Sucharevich <oleg2807@gmail.com>
Date: Wed, 13 Jan 2021 10:26:56 +0200
Subject: [PATCH 3/8] update codefresh yaml

---
 codefresh.yaml | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/codefresh.yaml b/codefresh.yaml
index 36ccfb9..2db01eb 100644
--- a/codefresh.yaml
+++ b/codefresh.yaml
@@ -207,24 +207,12 @@ steps:
         - master
 
         
-  build:
-    title: "Building production image"
-    type: build
-    stage: Build & Test
-    tag: ${{VERSION}}
-    image_name: codefresh/pikolo
-    when:
-      steps:
-      - name: release_binaries
-        on:
-        - success
-
   scan:
     title: "Scan image for vulnarabilities"
     image: snyk/snyk-cli:npm
     stage: Build & Test
     commands:
-      - snyk container test --docker codefresh/pikolo:${{VERSION}} --file=Dockerfile
+      - snyk container test --docker ${{IMAGE_NAME}}:${{VERSION}} --file=Dockerfile
     when:
       steps:
       - name: build

From 608ccf409fc7d7eb9830c73a5ee47b62a4aadfd0 Mon Sep 17 00:00:00 2001
From: Oleg Sucharevich <oleg2807@gmail.com>
Date: Wed, 13 Jan 2021 10:28:29 +0200
Subject: [PATCH 4/8] update codefresh.yaml

---
 codefresh.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/codefresh.yaml b/codefresh.yaml
index 2db01eb..0f9bfbb 100644
--- a/codefresh.yaml
+++ b/codefresh.yaml
@@ -221,7 +221,7 @@ steps:
 
   push_cli_image:
     title: "Push image"
-    stage: Push & Release
+    stage: Push
     type: push
     candidate: ${{build}}
     tags:

From c11592cb95f1dca0c93e798b20ca20215dff25e0 Mon Sep 17 00:00:00 2001
From: Oleg Sucharevich <oleg2807@gmail.com>
Date: Wed, 13 Jan 2021 10:34:03 +0200
Subject: [PATCH 5/8] update codefresh.yaml

---
 codefresh.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/codefresh.yaml b/codefresh.yaml
index 0f9bfbb..2a9f9ef 100644
--- a/codefresh.yaml
+++ b/codefresh.yaml
@@ -215,7 +215,7 @@ steps:
       - snyk container test --docker ${{IMAGE_NAME}}:${{VERSION}} --file=Dockerfile
     when:
       steps:
-      - name: build
+      - name: Building image
         on:
         - success
 

From b98021076a1695d84f17997e7e7581d8467c728d Mon Sep 17 00:00:00 2001
From: Oleg Sucharevich <oleg2807@gmail.com>
Date: Wed, 13 Jan 2021 11:04:41 +0200
Subject: [PATCH 6/8] update codefresh.yaml

---
 codefresh.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/codefresh.yaml b/codefresh.yaml
index 2a9f9ef..0f9bfbb 100644
--- a/codefresh.yaml
+++ b/codefresh.yaml
@@ -215,7 +215,7 @@ steps:
       - snyk container test --docker ${{IMAGE_NAME}}:${{VERSION}} --file=Dockerfile
     when:
       steps:
-      - name: Building image
+      - name: build
         on:
         - success
 

From 38d9bb052bb39e900dc3046b6ea6c413ee9d2d9d Mon Sep 17 00:00:00 2001
From: Oleg Sucharevich <oleg2807@gmail.com>
Date: Wed, 13 Jan 2021 11:13:52 +0200
Subject: [PATCH 7/8] update codefresh.yaml

---
 codefresh.yaml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/codefresh.yaml b/codefresh.yaml
index 0f9bfbb..0b44923 100644
--- a/codefresh.yaml
+++ b/codefresh.yaml
@@ -207,18 +207,6 @@ steps:
         - master
 
         
-  scan:
-    title: "Scan image for vulnarabilities"
-    image: snyk/snyk-cli:npm
-    stage: Build & Test
-    commands:
-      - snyk container test --docker ${{IMAGE_NAME}}:${{VERSION}} --file=Dockerfile
-    when:
-      steps:
-      - name: build
-        on:
-        - success
-
   push_cli_image:
     title: "Push image"
     stage: Push

From 8a1443edf5dccf4c83a9f53abd7e4e17e7756ef7 Mon Sep 17 00:00:00 2001
From: Oleg Sucharevich <oleg2807@gmail.com>
Date: Wed, 13 Jan 2021 14:20:30 +0200
Subject: [PATCH 8/8] wip

---
 codefresh.yaml | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/codefresh.yaml b/codefresh.yaml
index 0b44923..520dd70 100644
--- a/codefresh.yaml
+++ b/codefresh.yaml
@@ -204,20 +204,4 @@ steps:
         - finished
       branch:
         only:
-        - master
-
-        
-  push_cli_image:
-    title: "Push image"
-    stage: Push
-    type: push
-    candidate: ${{build}}
-    tags:
-    - latest
-    - ${{VERSION}}
-    registry: "dockerhub"
-    when:
-      steps:
-        - name: build
-          on:
-          - success
+        - master   
\ No newline at end of file