Skip to content

Security patches #371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alex-codefresh merged 4 commits into from
Jan 10, 2020
Merged

Security patches #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b1407ad
security patch: update cf-errors
alex-codefresh Jan 10, 2020
5b3244e
security patches, Dockerfile:
alex-codefresh Jan 10, 2020
10a293a
Update codefresh.yml
alex-codefresh Jan 10, 2020
78e6ad6
Update package version
alex-codefresh Jan 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,34 @@
FROM golang:alpine as go

RUN apk add --update ca-certificates git
RUN apk --update add ca-certificates git

RUN go get github.com/github/hub

FROM node:10.15.3-alpine
FROM codefresh/node:10.15.3-alpine3.11

RUN apk --update add --no-cache ca-certificates git curl bash yarn

RUN apk add --update ca-certificates git curl jq py-pip bash && pip install yq
COPY --from=go /go/bin/hub /usr/local/bin/hub

ARG JQ_VERSION=1.6
ARG YQ_VERSION=2.4.1

RUN wget -O /usr/local/bin/jq https://github.com/stedolan/jq/releases/download/jq-${JQ_VERSION}/jq-linux64 && \
wget -O /usr/local/bin/yq https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64 && \
chmod +x /usr/local/bin/*

WORKDIR /cf-cli

COPY package.json /cf-cli
COPY check-version.js /cf-cli

RUN yarn --prod install
RUN yarn install --prod --frozen-lockfile && \
yarn cache clean

COPY . /cf-cli

RUN yarn generate-completion
RUN apk del yarn

RUN ln -s $(pwd)/lib/interface/cli/codefresh /usr/local/bin/codefresh

Expand Down
6 changes: 3 additions & 3 deletions codefresh.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@ steps:

install_dependencies:
title: 'Installing testing dependencies'
image: codefresh/node-tester-image:8.8.0
image: codefresh/node-tester-image:10.15.3
commands:
- yarn install --frozen-lockfile

eslint:
title: 'Running linting logic'
image: codefresh/node-tester-image:8.8.0
image: codefresh/node-tester-image:10.15.3
commands:
- yarn eslint

unit-tests:
title: 'Running unit tests'
image: codefresh/node-tester-image:8.8.0
image: codefresh/node-tester-image:10.15.3
commands:
- yarn test

Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "codefresh",
"version": "0.41.0",
"version": "0.41.1",
"description": "Codefresh command line utility",
"main": "index.js",
"preferGlobal": true,
Expand Down Expand Up @@ -34,7 +34,7 @@
"@codefresh-io/docker-reference": "^0.0.5",
"ajv": "^6.6.1",
"bluebird": "^3.5.1",
"cf-errors": "^0.1.11",
"cf-errors": "^0.1.12",
"chalk": "^1.1.3",
"cli-progress": "^1.6.1",
"codefresh-sdk": "1.4.0",
Expand Down
Loading