From ba29fd7c24f446a8c8f13e87ddf00ab3cf926121 Mon Sep 17 00:00:00 2001
From: Mateusz Szostok <mateusz@structsure.co>
Date: Wed, 10 Mar 2021 11:19:27 +0100
Subject: [PATCH] Remove hardcoded version for git and openssh, run build on
 release-0.2 branch (#183)

* Remove hardcoded version for git and openssh

* Add release-0.2 branch build add Dockerfile to push paths

* Update long-running cluster only on master commits
---
 .github/workflows/branch-build.yaml | 3 +++
 Dockerfile                          | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/branch-build.yaml b/.github/workflows/branch-build.yaml
index 9c91364cf..e0a3cb930 100644
--- a/.github/workflows/branch-build.yaml
+++ b/.github/workflows/branch-build.yaml
@@ -13,8 +13,10 @@ on:
       - "deploy/**"
       - "!**.md"
       - "och-content/**"
+      - "Dockerfile"
     branches:
       - "master"
+      - "release-0.2"
 
 jobs:
   entry-tests:
@@ -192,6 +194,7 @@ jobs:
     name: Update cluster
     runs-on: ubuntu-latest
     needs: [ integration-tests, entry-tests ]
+    if: github.ref == 'refs/heads/master'
 
     steps:
       - name: Checkout code
diff --git a/Dockerfile b/Dockerfile
index 63622ce19..22b0c09ae 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -44,7 +44,7 @@ COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 COPY --from=builder /bin/$COMPONENT /app
 COPY test/och-content /test/och-content
 
-RUN apk add --no-cache git=2.26.2-r0 openssh=8.3_p1-r1
+RUN apk add --no-cache 'git=~2.26' 'openssh=~8.3'
 RUN mkdir /root/.ssh
 RUN chmod 700 /root/.ssh
 RUN ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts