Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: upgrade dependencies #866

Merged
merged 8 commits into from
Nov 21, 2024
Merged

build: upgrade dependencies #866

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
51de195
build(docker): upgrade dependencies
masontikhonov Nov 17, 2024
b517907
build(node): upgrade dependencies
masontikhonov Nov 17, 2024
3959aca
ci: trigger ci
masontikhonov Nov 18, 2024
d1076c5
ci: trigger ci
masontikhonov Nov 20, 2024
71ca581
build: remove npm
masontikhonov Nov 20, 2024
9eeae0e
Revert "build: remove npm"
masontikhonov Nov 20, 2024
4fe8a9a
build: upgrade base images
masontikhonov Nov 20, 2024
b59a2fd
ci: bump version
masontikhonov Nov 21, 2024
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v18.17.1
v22.11.0
18 changes: 5 additions & 13 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,44 +1,36 @@
# 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.27.4 as kubectl
FROM bitnami/kubectl:1.30.6 AS kubectl

# Main
FROM node:18.17.1-alpine3.18

FROM node:22.11.0-alpine3.20
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

ENTRYPOINT ["codefresh"]
4 changes: 2 additions & 2 deletions Dockerfile-debian
View file
Open in desktop
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.27.4 as kubectl
FROM bitnami/kubectl:1.30.6 as kubectl

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

RUN apt update \
&& apt -y install \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile-debian-rootless
View file
Open in desktop
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.27.4 as kubectl
FROM bitnami/kubectl:1.30.6 as kubectl

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

RUN apt update \
&& apt -y install \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile-rootless
View file
Open in desktop
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.27.4 as kubectl
FROM bitnami/kubectl:1.30.6 as kubectl

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

RUN apk --update add --no-cache \
bash \
Expand Down
20 changes: 7 additions & 13 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "codefresh",
"version": "0.87.6",
"version": "0.87.7",
"description": "Codefresh command line utility",
"main": "index.js",
"preferGlobal": true,
Expand Down Expand Up @@ -32,17 +32,10 @@
"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",
"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"
"kubernetes-client/@kubernetes/client-node": ">=0.22.2",
"tough-cookie": "^4.1.3"
},
"dependencies": {
"@codefresh-io/docker-reference": "^0.0.5",
Expand All @@ -64,7 +57,7 @@
"figlet": "^1.4.0",
"filesize": "^3.5.11",
"firebase": "git+https://github.com/codefresh-io/firebase.git#80b2ed883ff281cd67b53bd0f6a0bbd6f330fed5",
"flat": "^4.1.1",
"flat": "^5.0.2",
"inquirer": "^7.1.0",
"js-yaml": "^3.10.0",
"kefir": "^3.8.1",
Expand All @@ -79,7 +72,7 @@
"promise-retry": "^2.0.1",
"recursive-readdir": "^2.2.3",
"request": "^2.88.0",
"request-promise": "^4.2.2",
"request-promise": "^4.2.6",
"requestretry": "^7.0.2",
"rimraf": "^2.6.2",
"semver": "^7.5.4",
Expand Down Expand Up @@ -114,5 +107,6 @@
"setupFiles": [
"./test-setup.js"
]
}
},
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
}
Loading