Skip to content

Commit

Permalink
fix: revert previous version (#869)
Browse files Browse the repository at this point in the history
## What

This reverts previous version 0.88.0.

## Why

New release added Node.js-level warnings to output which broke custom
parsing of CLI output.
  • Loading branch information
masontikhonov authored Nov 21, 2024
1 parent a8af20c commit 04b5e0a
Show file tree
Hide file tree
Showing 7 changed files with 2,309 additions and 2,679 deletions.
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v22.11.0
v18.17.1
18 changes: 13 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,36 +1,44 @@
# go hub binary
FROM golang:alpine AS go
FROM golang:alpine as go
RUN apk --update add 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
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 bitnami/kubectl:1.30.6 AS kubectl
FROM bitnami/kubectl:1.27.4 as kubectl

# Main
FROM node:22.11.0-alpine3.20
FROM node:18.17.1-alpine3.18

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

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/

WORKDIR /cf-cli

COPY package.json yarn.lock check-version.js run-check-version.js /cf-cli/

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

COPY . /cf-cli

RUN yarn generate-completion

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

RUN codefresh components update --location components
ENTRYPOINT ["codefresh"]
4 changes: 2 additions & 2 deletions Dockerfile-debian
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ RUN pip install yq==${YQ_VERSION}
RUN pyinstaller --noconfirm --onefile --log-level DEBUG --clean --distpath /tmp/ $(which yq)

# kubectl binary
FROM bitnami/kubectl:1.30.6 as kubectl
FROM bitnami/kubectl:1.27.4 as kubectl

# Main
FROM node:22.11.0-bullseye-slim
FROM node:18.17.1-bullseye-slim

RUN apt update \
&& apt -y install \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile-debian-rootless
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ RUN pip install yq==${YQ_VERSION}
RUN pyinstaller --noconfirm --onefile --log-level DEBUG --clean --distpath /tmp/ $(which yq)

# kubectl binary
FROM bitnami/kubectl:1.30.6 as kubectl
FROM bitnami/kubectl:1.27.4 as kubectl

# Main
FROM node:22.11.0-bullseye-slim
FROM node:18.17.1-bullseye-slim

RUN apt update \
&& apt -y install \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile-rootless
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ RUN pip install yq==${YQ_VERSION}
RUN pyinstaller --noconfirm --onefile --log-level DEBUG --clean --distpath /tmp/ $(which yq)

# kubectl binary
FROM bitnami/kubectl:1.30.6 as kubectl
FROM bitnami/kubectl:1.27.4 as kubectl

# Main
FROM node:22.11.0-alpine3.20
FROM node:18.17.1-alpine3.18

RUN apk --update add --no-cache \
bash \
Expand Down
20 changes: 13 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "codefresh",
"version": "0.88.0",
"version": "0.88.1",
"description": "Codefresh command line utility",
"main": "index.js",
"preferGlobal": true,
Expand Down Expand Up @@ -32,10 +32,17 @@
"assets": "lib/**/*.hbs"
},
"resolutions": {
"websocket-extensions": "^0.1.4",
"lodash": "^4.17.21",
"json-schema": "^0.4.0",
"ajv": "^6.12.6",
"normalize-url": "^4.5.1",
"ansi-regex": "^5.0.1",
"kubernetes-client/@kubernetes/client-node": ">=0.22.2",
"tough-cookie": "^4.1.3"
"y18n": "^4.0.1",
"shelljs": "^0.8.5",
"codefresh-sdk/swagger-client/qs": "6.9.7",
"kubernetes-client/qs": "6.9.7",
"**/request/qs": "6.5.3"
},
"dependencies": {
"@codefresh-io/docker-reference": "^0.0.5",
Expand All @@ -57,7 +64,7 @@
"figlet": "^1.4.0",
"filesize": "^3.5.11",
"firebase": "git+https://github.com/codefresh-io/firebase.git#80b2ed883ff281cd67b53bd0f6a0bbd6f330fed5",
"flat": "^5.0.2",
"flat": "^4.1.1",
"inquirer": "^7.1.0",
"js-yaml": "^3.10.0",
"kefir": "^3.8.1",
Expand All @@ -72,7 +79,7 @@
"promise-retry": "^2.0.1",
"recursive-readdir": "^2.2.3",
"request": "^2.88.0",
"request-promise": "^4.2.6",
"request-promise": "^4.2.2",
"requestretry": "^7.0.2",
"rimraf": "^2.6.2",
"semver": "^7.5.4",
Expand Down Expand Up @@ -107,6 +114,5 @@
"setupFiles": [
"./test-setup.js"
]
},
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
}
}
Loading

0 comments on commit 04b5e0a

Please sign in to comment.