Skip to content

Commit b833c0f

Browse files
vitalii-codefreshmasontikhonov
vitalii-codefresh
and
masontikhonov
authored
chore(CR-32490): updated components, node.js, tmp (#899)
> [!WARNING] > BREAKING CHANGE: drop `hub` - it's unavailable to use the wrapper of git 'hub' while running the docker image of 'codefresh/cli' --------- Co-authored-by: Zhenya Tikhonov <[email protected]>
1 parent ded47cc commit b833c0f

File tree

13 files changed

+927
-813
lines changed

13 files changed

+927
-813
lines changed

‎.nvmrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v22.21.0
1+
v24.12.0

‎Dockerfile‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,14 @@
1-
# go hub binary
2-
FROM golang:alpine AS go
3-
RUN apk --update add --no-scripts ca-certificates git
4-
RUN go install github.com/github/hub@latest
5-
6-
# python yq binary
7-
FROM six8/pyinstaller-alpine:alpine-3.6-pyinstaller-v3.4 AS yq
8-
ARG YQ_VERSION=2.10.0
9-
ENV PATH="/pyinstaller:$PATH"
10-
RUN pip install yq==${YQ_VERSION}
11-
RUN pyinstaller --noconfirm --onefile --log-level DEBUG --clean --distpath /tmp/ $(which yq)
12-
13-
# kubectl binary
14-
FROM bitnamilegacy/kubectl:1.33.1 AS kubectl
15-
16-
# Main
17-
FROM node:22.21.0-alpine3.22
1+
FROM node:24.12.0-alpine3.23
2+
ARG TARGETPLATFORM
183
RUN apk --update add --no-cache \
194
bash \
205
ca-certificates \
216
curl \
227
git \
238
jq
249
RUN npm upgrade -g npm
25-
COPY --from=go /go/bin/hub /usr/local/bin/hub
26-
COPY --from=yq /tmp/yq /usr/local/bin/yq
27-
COPY --from=kubectl /opt/bitnami/kubectl/bin/kubectl /usr/local/bin/
10+
COPY --from=mikefarah/yq:4.50.1 /usr/bin/yq /usr/local/bin/yq
11+
ADD --chmod=775 https://dl.k8s.io/release/v1.35.0/bin/${TARGETPLATFORM}/kubectl /usr/local/bin/kubectl
2812
WORKDIR /cf-cli
2913
COPY package.json yarn.lock check-version.js run-check-version.js /cf-cli/
3014
RUN yarn install --prod --frozen-lockfile && \

‎Dockerfile-debian‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,5 @@
1-
# go hub binary
2-
FROM golang:alpine as go
3-
RUN apk --update add --no-scripts ca-certificates git
4-
RUN go install github.com/github/hub@latest
5-
6-
# python yq binary
7-
FROM six8/pyinstaller-alpine:alpine-3.6-pyinstaller-v3.4 as yq
8-
ARG YQ_VERSION=2.10.0
9-
ENV PATH="/pyinstaller:$PATH"
10-
RUN pip install yq==${YQ_VERSION}
11-
RUN pyinstaller --noconfirm --onefile --log-level DEBUG --clean --distpath /tmp/ $(which yq)
12-
13-
# kubectl binary
14-
FROM bitnamilegacy/kubectl:1.33.1 as kubectl
15-
16-
# Main
17-
FROM node:22.21.0-trixie-slim
1+
FROM node:24.12.0-trixie-slim
2+
ARG TARGETPLATFORM
183
RUN apt update \
194
&& apt -y install \
205
apt-transport-https \
@@ -26,9 +11,8 @@ RUN apt update \
2611
jq \
2712
&& ln -s /bin/busybox /usr/bin/[[
2813
RUN npm upgrade -g npm
29-
COPY --from=go /go/bin/hub /usr/local/bin/hub
30-
COPY --from=yq /tmp/yq /usr/local/bin/yq
31-
COPY --from=kubectl /opt/bitnami/kubectl/bin/kubectl /usr/local/bin/
14+
COPY --from=mikefarah/yq:4.50.1 /usr/bin/yq /usr/local/bin/yq
15+
ADD --chmod=775 https://dl.k8s.io/release/v1.35.0/bin/${TARGETPLATFORM}/kubectl /usr/local/bin/kubectl
3216
WORKDIR /cf-cli
3317
COPY package.json yarn.lock check-version.js run-check-version.js /cf-cli/
3418
RUN yarn install --prod --frozen-lockfile && \

‎Dockerfile-debian-rootless‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,5 @@
1-
# go hub binary
2-
FROM golang:alpine as go
3-
RUN apk --update add --no-scripts ca-certificates git
4-
RUN go install github.com/github/hub@latest
5-
6-
# python yq binary
7-
FROM six8/pyinstaller-alpine:alpine-3.6-pyinstaller-v3.4 as yq
8-
ARG YQ_VERSION=2.10.0
9-
ENV PATH="/pyinstaller:$PATH"
10-
RUN pip install yq==${YQ_VERSION}
11-
RUN pyinstaller --noconfirm --onefile --log-level DEBUG --clean --distpath /tmp/ $(which yq)
12-
13-
# kubectl binary
14-
FROM bitnamilegacy/kubectl:1.33.1 as kubectl
15-
16-
# Main
17-
FROM node:22.21.0-trixie-slim
1+
FROM node:24.12.0-trixie-slim
2+
ARG TARGETPLATFORM
183
RUN apt update \
194
&& apt -y install \
205
bash \
@@ -25,9 +10,8 @@ RUN apt update \
2510
jq \
2611
&& ln -s /bin/busybox /usr/bin/[[
2712
RUN npm upgrade -g npm
28-
COPY --from=go /go/bin/hub /usr/local/bin/hub
29-
COPY --from=yq /tmp/yq /usr/local/bin/yq
30-
COPY --from=kubectl /opt/bitnami/kubectl/bin/kubectl /usr/local/bin/
13+
COPY --from=mikefarah/yq:4.50.1 /usr/bin/yq /usr/local/bin/yq
14+
ADD --chmod=775 https://dl.k8s.io/release/v1.35.0/bin/${TARGETPLATFORM}/kubectl /usr/local/bin/kubectl
3115
WORKDIR /cf-cli
3216
COPY package.json yarn.lock check-version.js run-check-version.js /cf-cli/
3317
RUN yarn install --prod --frozen-lockfile && \

‎Dockerfile-rootless‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,14 @@
1-
# go hub binary
2-
FROM golang:alpine as go
3-
RUN apk --update add --no-scripts ca-certificates git
4-
RUN go install github.com/github/hub@latest
5-
6-
# python yq binary
7-
FROM six8/pyinstaller-alpine:alpine-3.6-pyinstaller-v3.4 as yq
8-
ARG YQ_VERSION=2.10.0
9-
ENV PATH="/pyinstaller:$PATH"
10-
RUN pip install yq==${YQ_VERSION}
11-
RUN pyinstaller --noconfirm --onefile --log-level DEBUG --clean --distpath /tmp/ $(which yq)
12-
13-
# kubectl binary
14-
FROM bitnamilegacy/kubectl:1.33.1 as kubectl
15-
16-
# Main
17-
FROM node:22.21.0-alpine3.22
1+
FROM node:24.12.0-alpine3.23
2+
ARG TARGETPLATFORM
183
RUN apk --update add --no-cache \
194
bash \
205
ca-certificates \
216
curl \
227
git \
238
jq
249
RUN npm upgrade -g npm
25-
COPY --from=go /go/bin/hub /usr/local/bin/hub
26-
COPY --from=yq /tmp/yq /usr/local/bin/yq
27-
COPY --from=kubectl /opt/bitnami/kubectl/bin/kubectl /usr/local/bin/
10+
COPY --from=mikefarah/yq:4.50.1 /usr/bin/yq /usr/local/bin/yq
11+
ADD --chmod=775 https://dl.k8s.io/release/v1.35.0/bin/${TARGETPLATFORM}/kubectl /usr/local/bin/kubectl
2812
WORKDIR /cf-cli
2913
COPY package.json yarn.lock check-version.js run-check-version.js /cf-cli/
3014
RUN yarn install --prod --frozen-lockfile && \

‎lib/interface/cli/commands/app-proxy/helper.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const _ = require('lodash');
2-
const inquirer = require('inquirer');
2+
const inquirer = require('inquirer').default;
33
const YAML = require('yaml');
44
const { readFileSync, lstatSync } = require('fs');
55
const { resolve } = require('path');

‎lib/interface/cli/commands/app-proxy/uninstall.cmd.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable max-len */
22
const Command = require('../../Command');
33
const uninstallRoot = require('../root/uninstall.cmd');
4-
const inquirer = require('inquirer');
4+
const inquirer = require('inquirer').default;
55
const {
66
selectRuntime,
77
mergeWithValues,

‎lib/interface/cli/commands/hybrid/delete.cmd.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable max-len */
22
const Command = require('../../Command');
33
const runnerRoot = require('../root/runner.cmd');
4-
const inquirer = require('inquirer');
4+
const inquirer = require('inquirer').default;
55
const { getAllKubeContexts, getKubeContext } = require('../../helpers/kubernetes');
66
const unInstallRuntime = require('../runtimeEnvironments/uninstall.cmd');
77
const unInstallAgent = require('../agent/uninstall.cmd');

‎lib/interface/cli/commands/hybrid/init.cmd.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const fs = require('fs');
33

44
const Command = require('../../Command');
55
const runnerRoot = require('../root/runner.cmd');
6-
const inquirer = require('inquirer');
6+
const inquirer = require('inquirer').default;
77
const colors = require('colors');
88
const _ = require('lodash');
99
const { addProxyVariables, detectProxy, keyValueArrayToObject } = require('../../helpers/general');

‎lib/interface/cli/commands/hybrid/migration.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const { sdk } = require('../../../../logic');
44
const installAgent = require('../agent/install.cmd');
55
const installMonitoring = require('../monitor/install.cmd');
66
const colors = require('colors');
7-
const inquirer = require('inquirer');
7+
const inquirer = require('inquirer').default;
88
const fs = require('fs');
99
const {
1010
getTestPipeline,

0 commit comments

Comments
 (0)