Skip to content

Commit 6991f7a

Browse files
CR-18675 -- vuln (#816)
1 parent f782590 commit 6991f7a

8 files changed

+56
-40
lines changed

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN pip install yq==${YQ_VERSION}
1111
RUN pyinstaller --noconfirm --onefile --log-level DEBUG --clean --distpath /tmp/ $(which yq)
1212

1313
# Main
14-
FROM node:18.14.1-alpine3.17
14+
FROM node:18.16.0-alpine3.17
1515

1616
RUN apk --update add --no-cache ca-certificates git curl bash jq
1717

Dockerfile-debian

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN pip install yq==${YQ_VERSION}
1111
RUN pyinstaller --noconfirm --onefile --log-level DEBUG --clean --distpath /tmp/ $(which yq)
1212

1313
# Main
14-
FROM node:18.14.1-bullseye-slim
14+
FROM node:18.16.0-bullseye-slim
1515

1616
RUN apt update
1717
RUN apt -y install ca-certificates git curl bash jq busybox && ln -s /bin/busybox /usr/bin/[[

Dockerfile-debian-rootless

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN pip install yq==${YQ_VERSION}
1111
RUN pyinstaller --noconfirm --onefile --log-level DEBUG --clean --distpath /tmp/ $(which yq)
1212

1313
# Main
14-
FROM node:18.14.1-bullseye-slim
14+
FROM node:18.16.0-bullseye-slim
1515

1616
RUN apt update
1717
RUN apt -y install ca-certificates git curl bash jq busybox && ln -s /bin/busybox /usr/bin/[[

Dockerfile-rootless

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN pip install yq==${YQ_VERSION}
1111
RUN pyinstaller --noconfirm --onefile --log-level DEBUG --clean --distpath /tmp/ $(which yq)
1212

1313
# Main
14-
FROM node:18.14.1-alpine3.17
14+
FROM node:18.16.0-alpine3.17
1515

1616
RUN apk --update add --no-cache ca-certificates git curl bash jq
1717

codefresh-release.yml

+4-5
Original file line numberDiff line numberDiff line change
@@ -445,14 +445,13 @@ steps:
445445
update_documentation:
446446
stage: documentation
447447
title: "Update documentation http://cli.codefresh.io"
448-
image: docker:18.01
448+
image: codefresh/build-cli
449449
commands:
450-
- "apk update && apk add git nodejs"
451-
- "npm install"
450+
- "yarn"
452451
- "echo cleaning previous public dir and recreating worktree"
453-
- "rm -rf public && git worktree prune && git worktree add -B gh-pages public origin/gh-pages"
452+
- "rm -rf public && git worktree prune && git worktree add -B gh-pages public origin/gh-pages"
454453
- "echo Building public docs"
455-
- "npm run build-public-docs"
454+
- "yarn run build-public-docs"
456455
- "echo Push new docs to gh-pages detached branch"
457456
- 'git config --global user.email "[email protected]" && git config --global user.name "Automated CI"'
458457
- 'cd public && git add --all && git commit -m "Publish new documentation for version ${{PACKAGE_VERSION}}" && git push https://${{GITHUB_TOKEN}}@github.com/codefresh-io/cli.git'

codefresh.yml

+30-1
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ steps:
328328
type: codefresh-run
329329
arguments:
330330
PIPELINE_ID: 'codefresh-io/cli/release'
331-
DETACH: true
331+
TRIGGER_ID: codefresh-io/cli_1
332332
BRANCH: master
333333
VARIABLE:
334334
- PACKAGE_VERSION=${{PACKAGE_VERSION}}
@@ -342,3 +342,32 @@ steps:
342342
- name: create_manifest_list
343343
on:
344344
- success
345+
346+
execute_e2e_pipeline:
347+
stage: final
348+
title: "Execute E2E pipeline for image of this commit"
349+
type: codefresh-run
350+
arguments:
351+
PIPELINE_ID: 'cli-v1-e2e/root'
352+
VARIABLE:
353+
- CLI_VERSION=${{CF_SHORT_REVISION}}
354+
when:
355+
steps:
356+
- name: push_step_alpine
357+
on:
358+
- success
359+
360+
build_documentation:
361+
stage: test
362+
title: "build documentation http://cli.codefresh.io"
363+
image: codefresh/build-cli
364+
commands:
365+
- "echo Building public docs"
366+
- "yarn run build-public-docs"
367+
environment:
368+
- HUGO_VERSION=0.32.0
369+
when:
370+
steps:
371+
- name: install_dependencies
372+
on:
373+
- success

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "codefresh",
3-
"version": "0.84.1",
3+
"version": "0.84.2",
44
"description": "Codefresh command line utility",
55
"main": "index.js",
66
"preferGlobal": true,

yarn.lock

+17-29
Original file line numberDiff line numberDiff line change
@@ -2763,9 +2763,9 @@ html-encoding-sniffer@^1.0.2:
27632763
whatwg-encoding "^1.0.1"
27642764

27652765
http-cache-semantics@^4.0.0:
2766-
version "4.1.0"
2767-
resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
2768-
integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
2766+
version "4.1.1"
2767+
resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
2768+
integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
27692769

27702770
"http-parser-js@>=0.4.0 <0.4.11":
27712771
version "0.4.10"
@@ -3700,9 +3700,9 @@ jest@^23.6.0:
37003700
jest-cli "^23.6.0"
37013701

37023702
jose@^1.25.2:
3703-
version "1.27.0"
3704-
resolved "https://registry.yarnpkg.com/jose/-/jose-1.27.0.tgz#2b2b70978efdeeb0a0804e930a07992aede1ab91"
3705-
integrity sha512-SxYPCM9pWDaK070CXbxgL4ktVzLlE0yJxevDJtbWxv2WMQwYfpBZLYlG8PhChsiOfOXp6FrceRgTuZh1vZeDlg==
3703+
version "1.28.2"
3704+
resolved "https://registry.yarnpkg.com/jose/-/jose-1.28.2.tgz#97f4aa608d0020ae5c1051a2a33247b957401e5a"
3705+
integrity sha512-wWy51U2MXxYi3g8zk2lsQ8M6O1lartpkxuq1TYexzPKYLgHLZkCjklaATP36I5BUoWjF2sInB9U1Qf18fBZxNA==
37063706
dependencies:
37073707
"@panva/asn1.js" "^1.0.0"
37083708

@@ -4247,14 +4247,7 @@ mimic-response@^2.0.0:
42474247
resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz#d13763d35f613d09ec37ebb30bac0469c0ee8f43"
42484248
integrity sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==
42494249

4250-
minimatch@^3.0.3, minimatch@^3.0.4:
4251-
version "3.0.4"
4252-
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
4253-
integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
4254-
dependencies:
4255-
brace-expansion "^1.1.7"
4256-
4257-
minimatch@^3.0.5:
4250+
minimatch@^3.0.3, minimatch@^3.0.4, minimatch@^3.0.5:
42584251
version "3.1.2"
42594252
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
42604253
integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -4830,12 +4823,7 @@ path-key@^3.1.0:
48304823
resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
48314824
integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
48324825

4833-
path-parse@^1.0.5, path-parse@^1.0.6:
4834-
version "1.0.6"
4835-
resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
4836-
integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
4837-
4838-
path-parse@^1.0.7:
4826+
path-parse@^1.0.5, path-parse@^1.0.6, path-parse@^1.0.7:
48394827
version "1.0.7"
48404828
resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
48414829
integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
@@ -6326,9 +6314,9 @@ unbzip2-stream@^1.0.9:
63266314
through "^2.3.8"
63276315

63286316
underscore@^1.9.1:
6329-
version "1.10.2"
6330-
resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.10.2.tgz#73d6aa3668f3188e4adb0f1943bd12cfd7efaaaf"
6331-
integrity sha512-N4P+Q/BuyuEKFJ43B9gYuOj4TQUHXX+j2FqguVOpjkssLUUrnJofCcBccJSCoeturDoZU6GorDTHSvUDlSQbTg==
6317+
version "1.13.6"
6318+
resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.6.tgz#04786a1f589dc6c09f761fc5f45b89e935136441"
6319+
integrity sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==
63326320

63336321
union-value@^1.0.0:
63346322
version "1.0.1"
@@ -6639,16 +6627,16 @@ ws@^5.2.0:
66396627
async-limiter "~1.0.0"
66406628

66416629
ws@^6.1.0:
6642-
version "6.2.1"
6643-
resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
6644-
integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
6630+
version "6.2.2"
6631+
resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e"
6632+
integrity sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==
66456633
dependencies:
66466634
async-limiter "~1.0.0"
66476635

66486636
ws@^7.2.3:
6649-
version "7.3.0"
6650-
resolved "https://registry.yarnpkg.com/ws/-/ws-7.3.0.tgz#4b2f7f219b3d3737bc1a2fbf145d825b94d38ffd"
6651-
integrity sha512-iFtXzngZVXPGgpTlP1rBqsUK82p9tKqsWRPg5L56egiljujJT3vGAYnHANvFxBieXrTFavhzhxW52jnaWV+w2w==
6637+
version "7.5.9"
6638+
resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
6639+
integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
66526640

66536641
xml-name-validator@^3.0.0:
66546642
version "3.0.0"

0 commit comments

Comments
 (0)