diff --git a/Dockerfile-debian b/Dockerfile-debian index 0b39d6e56..2364825f1 100644 --- a/Dockerfile-debian +++ b/Dockerfile-debian @@ -1,30 +1,40 @@ -FROM node:24.18.0-trixie-slim +FROM octopusdeploy/dhi-node:24-debian13-dev@sha256:1684b453b97f985c384af99f71507adf5727e24e76c6cd8c1a2da949ad8588e0 as build ARG TARGETPLATFORM -RUN apt update \ - && apt -y install \ - apt-transport-https \ - bash \ - busybox \ - ca-certificates \ - curl \ - git \ - && ln -s /bin/busybox /usr/bin/[[ \ - && curl -L "https://github.com/jqlang/jq/releases/download/jq-1.8.2/jq-linux-$(dpkg --print-architecture)" -o /usr/local/bin/jq \ - && chmod +x /usr/local/bin/jq -RUN npm upgrade -g npm -COPY --from=mikefarah/yq:4.53.3 /usr/bin/yq /usr/local/bin/yq -ADD --chmod=775 https://dl.k8s.io/release/v1.36.1/bin/${TARGETPLATFORM}/kubectl /usr/local/bin/kubectl +#RUN apt update \ +# && apt -y install \ +# apt-transport-https \ +# bash \ +# busybox \ +# ca-certificates \ +# curl \ +# git \ +# && ln -s /bin/busybox /usr/bin/[[ \ +# && curl -L "https://github.com/jqlang/jq/releases/download/jq-1.8.2/jq-linux-$(dpkg --print-architecture)" -o /usr/local/bin/jq \ +# && chmod +x /usr/local/bin/jq +#RUN npm upgrade -g npm +#COPY --from=mikefarah/yq:4.53.3 /usr/bin/yq /usr/local/bin/yq +#ADD --chmod=775 https://dl.k8s.io/release/v1.36.1/bin/${TARGETPLATFORM}/kubectl /usr/local/bin/kubectl WORKDIR /cf-cli +ADD --chmod=775 https://dl.k8s.io/release/v1.36.1/bin/${TARGETPLATFORM}/kubectl /usr/local/bin/kubectl 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 #purpose of security -RUN npm -g uninstall npm +#RUN npm -g uninstall npm -RUN ln -s $(pwd)/lib/interface/cli/codefresh /usr/local/bin/codefresh +FROM octopusdeploy/dhi-node:24-debian_cf-cli-node-24-debian-13@sha256:91f550e9c617363429620203161cb44e7270efe125beb7b8b0dbb8b4f448a745 as base +COPY --chmod=755 --from=build /cf-cli /cf-cli +#COPY --chmod=755 --from=build . /cf-cli +WORKDIR /cf-cli +USER root +COPY --from=mikefarah/yq:4.53.3 /usr/bin/yq /usr/local/bin/yq +COPY --chmod=755 --from=build /usr/local/bin/kubectl /usr/local/bin/kubectl +COPY --chmod=755 --from=build /usr/local/bin/codefresh /usr/local/bin/codefresh +RUN ln -s /bin/busybox /usr/bin/[[ RUN codefresh components update --location components # Node.js warnings must be suppressed to ensure that automations relying on exact output are not disrupted diff --git a/package.json b/package.json index 5f3c842d9..d7bfe993a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "codefresh", - "version": "1.2.5", + "version": "1.2.6", "description": "Codefresh command line utility", "main": "index.js", "preferGlobal": true,