Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v22.21.0
v24.12.0
24 changes: 4 additions & 20 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,30 +1,14 @@
# go hub binary
FROM golang:alpine AS go
RUN apk --update add --no-scripts ca-certificates git
RUN go install github.com/github/hub@latest

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

# kubectl binary
FROM bitnamilegacy/kubectl:1.33.1 AS kubectl

# Main
FROM node:22.21.0-alpine3.22
FROM node:24.12.0-alpine3.23
ARG TARGETPLATFORM
RUN apk --update add --no-cache \
bash \
ca-certificates \
curl \
git \
jq
RUN npm upgrade -g npm
COPY --from=go /go/bin/hub /usr/local/bin/hub
COPY --from=yq /tmp/yq /usr/local/bin/yq
COPY --from=kubectl /opt/bitnami/kubectl/bin/kubectl /usr/local/bin/
COPY --from=mikefarah/yq:4.50.1 /usr/bin/yq /usr/local/bin/yq
ADD --chmod=775 https://dl.k8s.io/release/v1.35.0/bin/${TARGETPLATFORM}/kubectl /usr/local/bin/kubectl
WORKDIR /cf-cli
COPY package.json yarn.lock check-version.js run-check-version.js /cf-cli/
RUN yarn install --prod --frozen-lockfile && \
Expand Down
24 changes: 4 additions & 20 deletions Dockerfile-debian
Original file line number Diff line number Diff line change
@@ -1,20 +1,5 @@
# go hub binary
FROM golang:alpine as go
RUN apk --update add --no-scripts ca-certificates git
RUN go install github.com/github/hub@latest

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

# kubectl binary
FROM bitnamilegacy/kubectl:1.33.1 as kubectl

# Main
FROM node:22.21.0-trixie-slim
FROM node:24.12.0-trixie-slim
ARG TARGETPLATFORM
RUN apt update \
&& apt -y install \
apt-transport-https \
Expand All @@ -26,9 +11,8 @@ RUN apt update \
jq \
&& ln -s /bin/busybox /usr/bin/[[
RUN npm upgrade -g npm
COPY --from=go /go/bin/hub /usr/local/bin/hub
COPY --from=yq /tmp/yq /usr/local/bin/yq
COPY --from=kubectl /opt/bitnami/kubectl/bin/kubectl /usr/local/bin/
COPY --from=mikefarah/yq:4.50.1 /usr/bin/yq /usr/local/bin/yq
ADD --chmod=775 https://dl.k8s.io/release/v1.35.0/bin/${TARGETPLATFORM}/kubectl /usr/local/bin/kubectl
WORKDIR /cf-cli
COPY package.json yarn.lock check-version.js run-check-version.js /cf-cli/
RUN yarn install --prod --frozen-lockfile && \
Expand Down
24 changes: 4 additions & 20 deletions Dockerfile-debian-rootless
Original file line number Diff line number Diff line change
@@ -1,20 +1,5 @@
# go hub binary
FROM golang:alpine as go
RUN apk --update add --no-scripts ca-certificates git
RUN go install github.com/github/hub@latest

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

# kubectl binary
FROM bitnamilegacy/kubectl:1.33.1 as kubectl

# Main
FROM node:22.21.0-trixie-slim
FROM node:24.12.0-trixie-slim
ARG TARGETPLATFORM
RUN apt update \
&& apt -y install \
bash \
Expand All @@ -25,9 +10,8 @@ RUN apt update \
jq \
&& ln -s /bin/busybox /usr/bin/[[
RUN npm upgrade -g npm
COPY --from=go /go/bin/hub /usr/local/bin/hub
COPY --from=yq /tmp/yq /usr/local/bin/yq
COPY --from=kubectl /opt/bitnami/kubectl/bin/kubectl /usr/local/bin/
COPY --from=mikefarah/yq:4.50.1 /usr/bin/yq /usr/local/bin/yq
ADD --chmod=775 https://dl.k8s.io/release/v1.35.0/bin/${TARGETPLATFORM}/kubectl /usr/local/bin/kubectl
WORKDIR /cf-cli
COPY package.json yarn.lock check-version.js run-check-version.js /cf-cli/
RUN yarn install --prod --frozen-lockfile && \
Expand Down
24 changes: 4 additions & 20 deletions Dockerfile-rootless
Original file line number Diff line number Diff line change
@@ -1,30 +1,14 @@
# go hub binary
FROM golang:alpine as go
RUN apk --update add --no-scripts ca-certificates git
RUN go install github.com/github/hub@latest

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

# kubectl binary
FROM bitnamilegacy/kubectl:1.33.1 as kubectl

# Main
FROM node:22.21.0-alpine3.22
FROM node:24.12.0-alpine3.23
ARG TARGETPLATFORM
RUN apk --update add --no-cache \
bash \
ca-certificates \
curl \
git \
jq
RUN npm upgrade -g npm
COPY --from=go /go/bin/hub /usr/local/bin/hub
COPY --from=yq /tmp/yq /usr/local/bin/yq
COPY --from=kubectl /opt/bitnami/kubectl/bin/kubectl /usr/local/bin/
COPY --from=mikefarah/yq:4.50.1 /usr/bin/yq /usr/local/bin/yq
ADD --chmod=775 https://dl.k8s.io/release/v1.35.0/bin/${TARGETPLATFORM}/kubectl /usr/local/bin/kubectl
WORKDIR /cf-cli
COPY package.json yarn.lock check-version.js run-check-version.js /cf-cli/
RUN yarn install --prod --frozen-lockfile && \
Expand Down
2 changes: 1 addition & 1 deletion lib/interface/cli/commands/app-proxy/helper.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const _ = require('lodash');
const inquirer = require('inquirer');
const inquirer = require('inquirer').default;
const YAML = require('yaml');
const { readFileSync, lstatSync } = require('fs');
const { resolve } = require('path');
Expand Down
2 changes: 1 addition & 1 deletion lib/interface/cli/commands/app-proxy/uninstall.cmd.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable max-len */
const Command = require('../../Command');
const uninstallRoot = require('../root/uninstall.cmd');
const inquirer = require('inquirer');
const inquirer = require('inquirer').default;
const {
selectRuntime,
mergeWithValues,
Expand Down
2 changes: 1 addition & 1 deletion lib/interface/cli/commands/hybrid/delete.cmd.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable max-len */
const Command = require('../../Command');
const runnerRoot = require('../root/runner.cmd');
const inquirer = require('inquirer');
const inquirer = require('inquirer').default;
const { getAllKubeContexts, getKubeContext } = require('../../helpers/kubernetes');
const unInstallRuntime = require('../runtimeEnvironments/uninstall.cmd');
const unInstallAgent = require('../agent/uninstall.cmd');
Expand Down
2 changes: 1 addition & 1 deletion lib/interface/cli/commands/hybrid/init.cmd.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const fs = require('fs');

const Command = require('../../Command');
const runnerRoot = require('../root/runner.cmd');
const inquirer = require('inquirer');
const inquirer = require('inquirer').default;
const colors = require('colors');
const _ = require('lodash');
const { addProxyVariables, detectProxy, keyValueArrayToObject } = require('../../helpers/general');
Expand Down
2 changes: 1 addition & 1 deletion lib/interface/cli/commands/hybrid/migration.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const { sdk } = require('../../../../logic');
const installAgent = require('../agent/install.cmd');
const installMonitoring = require('../monitor/install.cmd');
const colors = require('colors');
const inquirer = require('inquirer');
const inquirer = require('inquirer').default;
const fs = require('fs');
const {
getTestPipeline,
Expand Down
2 changes: 1 addition & 1 deletion lib/interface/cli/commands/hybrid/upgrade.cmd.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/* eslint-disable max-len */
const Command = require('../../Command');
const runnerRoot = require('../root/runner.cmd');
const inquirer = require('inquirer');
const inquirer = require('inquirer').default;
const { getAllKubeContexts, getKubeContext, getAllNamespaces } = require('../../helpers/kubernetes');
const colors = require('colors');
const DEFAULTS = require('../../defaults');
Expand Down
9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "codefresh",
"version": "0.89.6",
"version": "1.0.0",
"description": "Codefresh command line utility",
"main": "index.js",
"preferGlobal": true,
Expand Down Expand Up @@ -44,7 +44,8 @@
"kubernetes-client/@kubernetes/client-node": ">=0.22.2",
"tough-cookie": "^4.1.3",
"openid-client": "^4.9.0",
"**/request/form-data": "^2.5.5"
"**/request/form-data": "^2.5.5",
"**/request/qs": "6.14.1"
},
"dependencies": {
"@codefresh-io/docker-reference": "^0.0.5",
Expand All @@ -67,7 +68,7 @@
"filesize": "^3.5.11",
"firebase": "git+https://github.com/codefresh-io/firebase.git#80b2ed883ff281cd67b53bd0f6a0bbd6f330fed5",
"flat": "^5.0.2",
"inquirer": "^7.1.0",
"inquirer": "^12.11.1",
"js-yaml": "^3.10.0",
"kefir": "^3.8.1",
"kubernetes-client": "^9.0.0",
Expand Down Expand Up @@ -109,7 +110,7 @@
"author": "Codefresh",
"license": "ISC",
"engines": {
"node": ">=14.0.0"
"node": "^24.0.0"
},
"jest": {
"testEnvironment": "node",
Expand Down
Loading