Skip to content

Commit a8af20c

Browse files
build: upgrade dependencies (#866)
## What This upgrades number of dependencies in order to address known CVE.
1 parent 32f181a commit a8af20c

7 files changed

+2678
-2308
lines changed

.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v18.17.1
1+
v22.11.0

Dockerfile

+5-13
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,36 @@
11
# go hub binary
2-
FROM golang:alpine as go
2+
FROM golang:alpine AS go
33
RUN apk --update add ca-certificates git
44
RUN go install github.com/github/hub@latest
55

66
# python yq binary
7-
FROM six8/pyinstaller-alpine:alpine-3.6-pyinstaller-v3.4 as yq
7+
FROM six8/pyinstaller-alpine:alpine-3.6-pyinstaller-v3.4 AS yq
88
ARG YQ_VERSION=2.10.0
99
ENV PATH="/pyinstaller:$PATH"
1010
RUN pip install yq==${YQ_VERSION}
1111
RUN pyinstaller --noconfirm --onefile --log-level DEBUG --clean --distpath /tmp/ $(which yq)
1212

1313
# kubectl binary
14-
FROM bitnami/kubectl:1.27.4 as kubectl
14+
FROM bitnami/kubectl:1.30.6 AS kubectl
1515

1616
# Main
17-
FROM node:18.17.1-alpine3.18
18-
17+
FROM node:22.11.0-alpine3.20
1918
RUN apk --update add --no-cache \
2019
bash \
2120
ca-certificates \
2221
curl \
2322
git \
2423
jq
25-
2624
COPY --from=go /go/bin/hub /usr/local/bin/hub
2725
COPY --from=yq /tmp/yq /usr/local/bin/yq
2826
COPY --from=kubectl /opt/bitnami/kubectl/bin/kubectl /usr/local/bin/
29-
3027
WORKDIR /cf-cli
31-
3228
COPY package.json yarn.lock check-version.js run-check-version.js /cf-cli/
33-
3429
RUN yarn install --prod --frozen-lockfile && \
3530
yarn cache clean
36-
3731
COPY . /cf-cli
38-
3932
RUN yarn generate-completion
40-
4133
RUN ln -s $(pwd)/lib/interface/cli/codefresh /usr/local/bin/codefresh
42-
4334
RUN codefresh components update --location components
35+
4436
ENTRYPOINT ["codefresh"]

Dockerfile-debian

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

1313
# kubectl binary
14-
FROM bitnami/kubectl:1.27.4 as kubectl
14+
FROM bitnami/kubectl:1.30.6 as kubectl
1515

1616
# Main
17-
FROM node:18.17.1-bullseye-slim
17+
FROM node:22.11.0-bullseye-slim
1818

1919
RUN apt update \
2020
&& apt -y install \

Dockerfile-debian-rootless

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

1313
# kubectl binary
14-
FROM bitnami/kubectl:1.27.4 as kubectl
14+
FROM bitnami/kubectl:1.30.6 as kubectl
1515

1616
# Main
17-
FROM node:18.17.1-bullseye-slim
17+
FROM node:22.11.0-bullseye-slim
1818

1919
RUN apt update \
2020
&& apt -y install \

Dockerfile-rootless

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

1313
# kubectl binary
14-
FROM bitnami/kubectl:1.27.4 as kubectl
14+
FROM bitnami/kubectl:1.30.6 as kubectl
1515

1616
# Main
17-
FROM node:18.17.1-alpine3.18
17+
FROM node:22.11.0-alpine3.20
1818

1919
RUN apk --update add --no-cache \
2020
bash \

package.json

+7-13
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "codefresh",
3-
"version": "0.87.6",
3+
"version": "0.88.0",
44
"description": "Codefresh command line utility",
55
"main": "index.js",
66
"preferGlobal": true,
@@ -32,17 +32,10 @@
3232
"assets": "lib/**/*.hbs"
3333
},
3434
"resolutions": {
35-
"websocket-extensions": "^0.1.4",
36-
"lodash": "^4.17.21",
3735
"json-schema": "^0.4.0",
38-
"ajv": "^6.12.6",
39-
"normalize-url": "^4.5.1",
4036
"ansi-regex": "^5.0.1",
41-
"y18n": "^4.0.1",
42-
"shelljs": "^0.8.5",
43-
"codefresh-sdk/swagger-client/qs": "6.9.7",
44-
"kubernetes-client/qs": "6.9.7",
45-
"**/request/qs": "6.5.3"
37+
"kubernetes-client/@kubernetes/client-node": ">=0.22.2",
38+
"tough-cookie": "^4.1.3"
4639
},
4740
"dependencies": {
4841
"@codefresh-io/docker-reference": "^0.0.5",
@@ -64,7 +57,7 @@
6457
"figlet": "^1.4.0",
6558
"filesize": "^3.5.11",
6659
"firebase": "git+https://github.com/codefresh-io/firebase.git#80b2ed883ff281cd67b53bd0f6a0bbd6f330fed5",
67-
"flat": "^4.1.1",
60+
"flat": "^5.0.2",
6861
"inquirer": "^7.1.0",
6962
"js-yaml": "^3.10.0",
7063
"kefir": "^3.8.1",
@@ -79,7 +72,7 @@
7972
"promise-retry": "^2.0.1",
8073
"recursive-readdir": "^2.2.3",
8174
"request": "^2.88.0",
82-
"request-promise": "^4.2.2",
75+
"request-promise": "^4.2.6",
8376
"requestretry": "^7.0.2",
8477
"rimraf": "^2.6.2",
8578
"semver": "^7.5.4",
@@ -114,5 +107,6 @@
114107
"setupFiles": [
115108
"./test-setup.js"
116109
]
117-
}
110+
},
111+
"packageManager": "[email protected]+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
118112
}

0 commit comments

Comments
 (0)