Skip to content

Commit

Permalink
Remove hardcoded version for git and openssh, run build on release-0.…
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
mszostok committed Mar 10, 2021
1 parent 4337e3b commit ba29fd7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .github/workflows/branch-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ on:
- "deploy/**"
- "!**.md"
- "och-content/**"
- "Dockerfile"
branches:
- "master"
- "release-0.2"

jobs:
entry-tests:
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ba29fd7

Please sign in to comment.