Skip to content

Commit a43e388

Browse files
syan-tibcosyan-tibco
authored
Upgrade docker image (#87)
1 parent 9e3408d commit a43e388

File tree

5 files changed

+76
-71
lines changed

5 files changed

+76
-71
lines changed

‎docker/Dockerfile‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
FROM python:3.12.11-alpine3.22 AS builder-aws
1212
ARG AWS_CLI_VERSION
13-
ENV AWS_CLI_VERSION=${AWS_CLI_VERSION:-"2.27.31"}
13+
ENV AWS_CLI_VERSION=${AWS_CLI_VERSION:-"2.28.11"}
1414

1515
# Install build dependencies
1616
RUN apk add --no-cache \
@@ -36,7 +36,7 @@ RUN apk add --no-cache \
3636

3737
FROM python:3.12.11-alpine3.22 AS builder-azure
3838
ARG AZURE_CLI_VERSION
39-
ENV AZURE_CLI_VERSION=${AZURE_CLI_VERSION:-"2.74.0"}
39+
ENV AZURE_CLI_VERSION=${AZURE_CLI_VERSION:-"2.76.0"}
4040
WORKDIR /azure
4141
RUN apk add --no-cache --update python3 py3-pip && \
4242
apk add --no-cache --update --virtual=build gcc musl-dev python3-dev libffi-dev openssl-dev cargo make && \
@@ -68,7 +68,7 @@ RUN ln -s /opt/aws-cli/bin/aws /usr/local/bin/aws && \
6868

6969
# eksctl https://github.com/eksctl-io/eksctl/releases
7070
ARG EKSCTL_VERSION
71-
ENV EKSCTL_VERSION=${EKSCTL_VERSION:-"v0.210.0"}
71+
ENV EKSCTL_VERSION=${EKSCTL_VERSION:-"v0.212.0"}
7272
RUN CMD_NAME=eksctl && \
7373
curl --silent --location "https://github.com/eksctl-io/eksctl/releases/download/${EKSCTL_VERSION}/${CMD_NAME}_$(uname -s)_${TARGETARCH}.tar.gz" | tar xz -C /tmp && \
7474
chmod +x /tmp/${CMD_NAME} && mv /tmp/${CMD_NAME} /usr/local/bin/${CMD_NAME}-${EKSCTL_VERSION} && \
@@ -92,7 +92,7 @@ RUN ln -s /usr/bin/python3 /usr/local/bin/python && ln -s /azure/.venv/bin/az /u
9292

9393
# Azure CLI Bicep https://github.com/Azure/bicep/releases
9494
ARG AZURE_CLI_BICEP_VERSION
95-
ENV AZURE_CLI_BICEP_VERSION=${AZURE_CLI_BICEP_VERSION:-"v0.36.1"}
95+
ENV AZURE_CLI_BICEP_VERSION=${AZURE_CLI_BICEP_VERSION:-"v0.37.4"}
9696
RUN echo "AZURE_CLI_BICEP_VERSION=${AZURE_CLI_BICEP_VERSION}" && \
9797
az --version && \
9898
az bicep install --version ${AZURE_CLI_BICEP_VERSION} && \
@@ -101,7 +101,7 @@ RUN echo "AZURE_CLI_BICEP_VERSION=${AZURE_CLI_BICEP_VERSION}" && \
101101

102102
# gcloud cli https://cloud.google.com/sdk/docs/release-notes
103103
ARG CLOUD_SDK_VERSION
104-
ENV CLOUD_SDK_VERSION=${CLOUD_SDK_VERSION:-"510.0.0"}
104+
ENV CLOUD_SDK_VERSION=${CLOUD_SDK_VERSION:-"534.0.0"}
105105
ENV PATH=/google-cloud-sdk/bin:$PATH
106106
RUN if [ `uname -m` = 'x86_64' ]; then echo -n "x86_64" > /tmp/arch; else echo -n "arm" > /tmp/arch; fi;
107107
RUN ARCH=`cat /tmp/arch` && \
@@ -117,7 +117,7 @@ RUN ARCH=`cat /tmp/arch` && \
117117

118118
# cue for yaml validation https://github.com/cue-lang/cue/releases
119119
ARG CUE_VERSION
120-
ENV CUE_VERSION=${CUE_VERSION:-"v0.13.1"}
120+
ENV CUE_VERSION=${CUE_VERSION:-"v0.14.1"}
121121
RUN CMD_NAME=cue && \
122122
curl --silent --location "https://github.com/cue-lang/cue/releases/download/${CUE_VERSION}/${CMD_NAME}_${CUE_VERSION}_${TARGETOS}_${TARGETARCH}.tar.gz" | tar xz -C /tmp && \
123123
chmod +x /tmp/${CMD_NAME} && mv /tmp/${CMD_NAME} /usr/local/bin/${CMD_NAME}-${CUE_VERSION} && \
@@ -130,13 +130,13 @@ RUN ln -sf /usr/bin/yq /usr/local/bin/yq4
130130
# The following are for recipe meta.tools compatibility
131131
# yq 4 utility https://github.com/mikefarah/yq/releases
132132
ARG YQ_VERSION_440
133-
ENV YQ_VERSION_440=${YQ_VERSION_440:-"v4.45.4"}
133+
ENV YQ_VERSION_440=${YQ_VERSION_440:-"v4.47.1"}
134134
RUN CMD_NAME=yq && \
135135
curl -sSLo /usr/local/bin/${CMD_NAME}-4.40 "https://github.com/mikefarah/${CMD_NAME}/releases/download/${YQ_VERSION_440}/${CMD_NAME}_${TARGETOS}_${TARGETARCH}" && \
136136
chmod +x /usr/local/bin/${CMD_NAME}-4.40
137137

138138
# vcluster for vcluster https://github.com/loft-sh/vcluster/releases
139-
ARG VCLUSTER_VERSION=v0.25.1
139+
ARG VCLUSTER_VERSION=v0.27.0
140140
RUN export CMD_NAME=vcluster && \
141141
curl --silent --location -o /tmp/${CMD_NAME} "https://github.com/loft-sh/vcluster/releases/download/${VCLUSTER_VERSION}/${CMD_NAME}-${TARGETOS}-${TARGETARCH}" && \
142142
chmod +x /tmp/${CMD_NAME} && mv /tmp/${CMD_NAME} /usr/local/bin/${CMD_NAME}-${VCLUSTER_VERSION} && \
@@ -151,6 +151,14 @@ RUN CMD_NAME=helm && \
151151
chmod +x /tmp/${TARGETOS}-${TARGETARCH}/${CMD_NAME} && mv -f /tmp/${TARGETOS}-${TARGETARCH}/${CMD_NAME} /usr/local/bin/${CMD_NAME}-3.17 && \
152152
ln -sf /usr/local/bin/${CMD_NAME}-3.17 /usr/local/bin/helm
153153

154+
# helm https://github.com/helm/helm/releases
155+
ARG HELM_VERSION_318
156+
ENV HELM_VERSION_318=${HELM_VERSION_318:-"v3.18.5"}
157+
RUN CMD_NAME=helm && \
158+
curl -k --silent --location "https://get.helm.sh/${CMD_NAME}-${HELM_VERSION_318}-${TARGETOS}-${TARGETARCH}.tar.gz" | tar xz -C /tmp && \
159+
chmod +x /tmp/${TARGETOS}-${TARGETARCH}/${CMD_NAME} && mv -f /tmp/${TARGETOS}-${TARGETARCH}/${CMD_NAME} /usr/local/bin/${CMD_NAME}-3.18 && \
160+
ln -sf /usr/local/bin/${CMD_NAME}-3.18 /usr/local/bin/helm
161+
154162
# kubectl https://kubernetes.io/releases/
155163
ARG KUBECTL_VERSION_132
156164
ENV KUBECTL_VERSION_132=${KUBECTL_VERSION_132:-"v1.32.5"}
@@ -161,7 +169,7 @@ RUN CMD_NAME=kubectl && \
161169

162170
# kubectl https://kubernetes.io/releases/
163171
ARG KUBECTL_VERSION_133
164-
ENV KUBECTL_VERSION_133=${KUBECTL_VERSION_133:-"v1.33.1"}
172+
ENV KUBECTL_VERSION_133=${KUBECTL_VERSION_133:-"v1.33.4"}
165173
RUN CMD_NAME=kubectl && \
166174
curl -sLO https://dl.k8s.io/release/${KUBECTL_VERSION_133}/bin/${TARGETOS}/${TARGETARCH}/${CMD_NAME} && \
167175
chmod +x ./${CMD_NAME} && mv -f ./${CMD_NAME} /usr/local/bin/${CMD_NAME}-1.33

‎docker/Dockerfile-on-prem‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,33 +25,33 @@ RUN ln -sf /usr/bin/yq /usr/local/bin/yq4
2525
# The following are for recipe meta.tools compatibility
2626
# yq 4 utility https://github.com/mikefarah/yq/releases
2727
ARG YQ_VERSION_440
28-
ENV YQ_VERSION_440=${YQ_VERSION_440:-"v4.45.1"}
28+
ENV YQ_VERSION_440=${YQ_VERSION_440:-"v4.47.1"}
2929
RUN CMD_NAME=yq && \
3030
curl -sSLo /usr/local/bin/${CMD_NAME}-4.40 "https://github.com/mikefarah/${CMD_NAME}/releases/download/${YQ_VERSION_440}/${CMD_NAME}_${TARGETOS}_${TARGETARCH}" && \
3131
chmod +x /usr/local/bin/${CMD_NAME}-4.40
3232

3333
# vcluster for vcluster https://github.com/loft-sh/vcluster/releases
34-
ARG VCLUSTER_VERSION=v0.22.4
34+
ARG VCLUSTER_VERSION=v0.27.0
3535
RUN export CMD_NAME=vcluster && \
3636
curl --silent --location -o /tmp/${CMD_NAME} "https://github.com/loft-sh/vcluster/releases/download/${VCLUSTER_VERSION}/${CMD_NAME}-${TARGETOS}-${TARGETARCH}" && \
3737
chmod +x /tmp/${CMD_NAME} && mv /tmp/${CMD_NAME} /usr/local/bin/${CMD_NAME}-${VCLUSTER_VERSION} && \
3838
ln -sf /usr/local/bin/${CMD_NAME}-${VCLUSTER_VERSION} /usr/local/bin/${CMD_NAME} && \
3939
${CMD_NAME} version
4040

4141
# helm https://github.com/helm/helm/releases
42-
ARG HELM_VERSION_317
43-
ENV HELM_VERSION_317=${HELM_VERSION_317:-"v3.17.0"}
42+
ARG HELM_VERSION_318
43+
ENV HELM_VERSION_318=${HELM_VERSION_318:-"v3.18.5"}
4444
RUN CMD_NAME=helm && \
45-
curl --silent --location "https://get.helm.sh/${CMD_NAME}-${HELM_VERSION_317}-${TARGETOS}-${TARGETARCH}.tar.gz" | tar xz -C /tmp && \
46-
chmod +x /tmp/${TARGETOS}-${TARGETARCH}/${CMD_NAME} && mv -f /tmp/${TARGETOS}-${TARGETARCH}/${CMD_NAME} /usr/local/bin/${CMD_NAME}-3.17 && \
47-
ln -sf /usr/local/bin/${CMD_NAME}-3.17 /usr/local/bin/helm
45+
curl -k --silent --location "https://get.helm.sh/${CMD_NAME}-${HELM_VERSION_318}-${TARGETOS}-${TARGETARCH}.tar.gz" | tar xz -C /tmp && \
46+
chmod +x /tmp/${TARGETOS}-${TARGETARCH}/${CMD_NAME} && mv -f /tmp/${TARGETOS}-${TARGETARCH}/${CMD_NAME} /usr/local/bin/${CMD_NAME}-3.18 && \
47+
ln -sf /usr/local/bin/${CMD_NAME}-3.18 /usr/local/bin/helm
4848

4949
# kubectl https://kubernetes.io/releases/
50-
ARG KUBECTL_VERSION_132
51-
ENV KUBECTL_VERSION_132=${KUBECTL_VERSION_132:-"v1.32.1"}
50+
ARG KUBECTL_VERSION_133
51+
ENV KUBECTL_VERSION_133=${KUBECTL_VERSION_133:-"v1.33.4"}
5252
RUN CMD_NAME=kubectl && \
53-
curl -sLO https://dl.k8s.io/release/${KUBECTL_VERSION_132}/bin/${TARGETOS}/${TARGETARCH}/${CMD_NAME} && \
54-
chmod +x ./${CMD_NAME} && mv -f ./${CMD_NAME} /usr/local/bin/${CMD_NAME}-1.32 && \
55-
ln -sf /usr/local/bin/${CMD_NAME}-1.32 /usr/local/bin/kubectl
53+
curl -sLO https://dl.k8s.io/release/${KUBECTL_VERSION_133}/bin/${TARGETOS}/${TARGETARCH}/${CMD_NAME} && \
54+
chmod +x ./${CMD_NAME} && mv -f ./${CMD_NAME} /usr/local/bin/${CMD_NAME}-1.33 && \
55+
ln -sf /usr/local/bin/${CMD_NAME}-1.33 /usr/local/bin/kubectl
5656

5757
CMD ["/bin/bash"]

‎docker/Dockerfile-tester‎

Lines changed: 19 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
# Ubuntu 24 and 25 has strict glibc which will effect compbility between curl and coredns (star CNAME)
1111
# Microsoft artifact is not multi-arch build. see: https://mcr.microsoft.com/en-us/artifact/mar/playwright/tags
12-
FROM --platform=${BUILDPLATFORM} mcr.microsoft.com/playwright/python:v1.49.1-noble-${TARGETARCH}
12+
FROM --platform=${BUILDPLATFORM} mcr.microsoft.com/playwright/python:v1.54.0-noble-${TARGETARCH}
1313
# Ubuntu 22.04 playwright release
1414
#FROM --platform=${BUILDPLATFORM} mcr.microsoft.com/playwright/python:v1.49.1-jammy-${TARGETARCH}
1515

@@ -26,7 +26,7 @@ RUN apt-get update && apt-get install -y \
2626
# installation: https://docs.aws.amazon.com/cli/latest/userguide/getting-started-version.html
2727
# AWS use x86_64 and aarch64 but docker use amd64 and arm64
2828
ARG AWS_CLI_VERSION
29-
ENV AWS_CLI_VERSION=${AWS_CLI_VERSION:-"2.24.2"}
29+
ENV AWS_CLI_VERSION=${AWS_CLI_VERSION:-"2.28.11"}
3030
RUN AWS_ARCH=${TARGETARCH}; [ "${TARGETARCH}" = "arm64" ] && AWS_ARCH="aarch64" || true && \
3131
[ "${TARGETARCH}" = "amd64" ] && AWS_ARCH="x86_64" || true && \
3232
curl "https://awscli.amazonaws.com/awscli-exe-${TARGETOS}-${AWS_ARCH}-${AWS_CLI_VERSION}.zip" -o "awscliv2.zip" \
@@ -36,7 +36,7 @@ RUN AWS_ARCH=${TARGETARCH}; [ "${TARGETARCH}" = "arm64" ] && AWS_ARCH="aarch64"
3636

3737
# eksctl https://github.com/eksctl-io/eksctl/releases
3838
ARG EKSCTL_VERSION
39-
ENV EKSCTL_VERSION=${EKSCTL_VERSION:-"v0.203.0"}
39+
ENV EKSCTL_VERSION=${EKSCTL_VERSION:-"v0.212.0"}
4040
RUN CMD_NAME=eksctl && \
4141
curl --silent --location "https://github.com/eksctl-io/eksctl/releases/download/${EKSCTL_VERSION}/${CMD_NAME}_$(uname -s)_${TARGETARCH}.tar.gz" | tar xz -C /tmp && \
4242
chmod +x /tmp/${CMD_NAME} && mv /tmp/${CMD_NAME} /usr/local/bin/${CMD_NAME}-${EKSCTL_VERSION} && \
@@ -59,7 +59,7 @@ RUN CMD_NAME=docker-credential-ecr-login && \
5959
# Must use -4 for curl othewise get error like: curl: (35) OpenSSL SSL_connect: SSL_ERROR_SYSCALL in connection to packages.microsoft.com:443
6060
# ubuntu bug must add -k for curl or use wget: https://bugs.launchpad.net/ubuntu/+source/curl/+bug/2073448
6161
ARG AZURE_CLI_VERSION
62-
ENV AZURE_CLI_VERSION=${AZURE_CLI_VERSION:-"2.69.0"}
62+
ENV AZURE_CLI_VERSION=${AZURE_CLI_VERSION:-"2.74.0"}
6363
RUN mkdir -p /etc/apt/keyrings && \
6464
curl -4ksLS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/keyrings/microsoft.gpg > /dev/null && \
6565
chmod go+r /etc/apt/keyrings/microsoft.gpg && \
@@ -77,7 +77,7 @@ RUN mkdir -p /etc/apt/keyrings && \
7777

7878
# Azure CLI Bicep https://github.com/Azure/bicep/releases
7979
ARG AZURE_CLI_BICEP_VERSION
80-
ENV AZURE_CLI_BICEP_VERSION=${AZURE_CLI_BICEP_VERSION:-"v0.33.93"}
80+
ENV AZURE_CLI_BICEP_VERSION=${AZURE_CLI_BICEP_VERSION:-"v0.37.4"}
8181
RUN echo "AZURE_CLI_BICEP_VERSION=${AZURE_CLI_BICEP_VERSION}" && \
8282
az --version && \
8383
az bicep install --version ${AZURE_CLI_BICEP_VERSION} && \
@@ -88,7 +88,7 @@ RUN echo "AZURE_CLI_BICEP_VERSION=${AZURE_CLI_BICEP_VERSION}" && \
8888
# check new version: apt-cache policy google-cloud-cli
8989
# installation: https://cloud.google.com/sdk/docs/install#deb
9090
ARG CLOUD_SDK_VERSION
91-
ENV CLOUD_SDK_VERSION=${CLOUD_SDK_VERSION:-"510.0.0"}
91+
ENV CLOUD_SDK_VERSION=${CLOUD_SDK_VERSION:-"534.0.0"}
9292
RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && \
9393
curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | gpg --dearmor -o /usr/share/keyrings/cloud.google.gpg && \
9494
apt-get update -y && apt-get install -y google-cloud-cli=${CLOUD_SDK_VERSION}-0 google-cloud-cli-gke-gcloud-auth-plugin=${CLOUD_SDK_VERSION}-0 && \
@@ -100,7 +100,7 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.
100100

101101
# cue for yaml validation https://github.com/cue-lang/cue/releases
102102
ARG CUE_VERSION
103-
ENV CUE_VERSION=${CUE_VERSION:-"v0.12.0"}
103+
ENV CUE_VERSION=${CUE_VERSION:-"v0.14.1"}
104104
RUN CMD_NAME=cue && \
105105
curl --silent --location "https://github.com/cue-lang/cue/releases/download/${CUE_VERSION}/${CMD_NAME}_${CUE_VERSION}_${TARGETOS}_${TARGETARCH}.tar.gz" | tar xz -C /tmp && \
106106
chmod +x /tmp/${CMD_NAME} && mv /tmp/${CMD_NAME} /usr/local/bin/${CMD_NAME}-${CUE_VERSION} && \
@@ -109,7 +109,7 @@ RUN CMD_NAME=cue && \
109109

110110
# yq 4 utility https://github.com/mikefarah/yq/releases
111111
ARG YQ_VERSION_440
112-
ENV YQ_VERSION_440=${YQ_VERSION_440:-"v4.45.1"}
112+
ENV YQ_VERSION_440=${YQ_VERSION_440:-"v4.47.1"}
113113
RUN CMD_NAME=yq && \
114114
curl -sSLo /usr/local/bin/${CMD_NAME}-4.40 "https://github.com/mikefarah/${CMD_NAME}/releases/download/${YQ_VERSION_440}/${CMD_NAME}_${TARGETOS}_${TARGETARCH}" && \
115115
chmod +x /usr/local/bin/${CMD_NAME}-4.40 && \
@@ -119,34 +119,25 @@ RUN CMD_NAME=yq && \
119119
RUN ln -sf /usr/local/bin/yq /usr/local/bin/yq4
120120

121121
# vcluster for vcluster https://github.com/loft-sh/vcluster/releases
122-
ARG VCLUSTER_VERSION=v0.22.4
122+
ARG VCLUSTER_VERSION=v0.27.0
123123
RUN export CMD_NAME=vcluster && \
124124
curl --silent --location -o /tmp/${CMD_NAME} "https://github.com/loft-sh/vcluster/releases/download/${VCLUSTER_VERSION}/${CMD_NAME}-${TARGETOS}-${TARGETARCH}" && \
125125
chmod +x /tmp/${CMD_NAME} && mv /tmp/${CMD_NAME} /usr/local/bin/${CMD_NAME}-${VCLUSTER_VERSION} && \
126126
ln -sf /usr/local/bin/${CMD_NAME}-${VCLUSTER_VERSION} /usr/local/bin/${CMD_NAME} && \
127127
${CMD_NAME} version
128128

129129
# helm https://github.com/helm/helm/releases
130-
ARG HELM_VERSION_317
131-
ENV HELM_VERSION_317=${HELM_VERSION_317:-"v3.17.1"}
130+
ARG HELM_VERSION_318
131+
ENV HELM_VERSION_318=${HELM_VERSION_318:-"v3.18.5"}
132132
RUN CMD_NAME=helm && \
133-
curl -k --silent --location "https://get.helm.sh/${CMD_NAME}-${HELM_VERSION_317}-${TARGETOS}-${TARGETARCH}.tar.gz" | tar xz -C /tmp && \
134-
# wget -q "https://get.helm.sh/${CMD_NAME}-${HELM_VERSION_317}-${TARGETOS}-${TARGETARCH}.tar.gz" -O /tmp/helm.tar.gz && \
135-
# tar xz -f /tmp/helm.tar.gz -C /tmp && \
136-
chmod +x /tmp/${TARGETOS}-${TARGETARCH}/${CMD_NAME} && mv -f /tmp/${TARGETOS}-${TARGETARCH}/${CMD_NAME} /usr/local/bin/${CMD_NAME}-3.17 && \
137-
ln -sf /usr/local/bin/${CMD_NAME}-3.17 /usr/local/bin/helm
133+
curl -k --silent --location "https://get.helm.sh/${CMD_NAME}-${HELM_VERSION_318}-${TARGETOS}-${TARGETARCH}.tar.gz" | tar xz -C /tmp && \
134+
chmod +x /tmp/${TARGETOS}-${TARGETARCH}/${CMD_NAME} && mv -f /tmp/${TARGETOS}-${TARGETARCH}/${CMD_NAME} /usr/local/bin/${CMD_NAME}-3.18 && \
135+
ln -sf /usr/local/bin/${CMD_NAME}-3.18 /usr/local/bin/helm
138136

139137
# kubectl https://kubernetes.io/releases/
140-
ARG KUBECTL_VERSION_132
141-
ENV KUBECTL_VERSION_132=${KUBECTL_VERSION_132:-"v1.32.1"}
138+
ARG KUBECTL_VERSION_133
139+
ENV KUBECTL_VERSION_133=${KUBECTL_VERSION_133:-"v1.33.4"}
142140
RUN CMD_NAME=kubectl && \
143-
curl -sLO https://dl.k8s.io/release/${KUBECTL_VERSION_132}/bin/${TARGETOS}/${TARGETARCH}/${CMD_NAME} && \
144-
chmod +x ./${CMD_NAME} && mv -f ./${CMD_NAME} /usr/local/bin/${CMD_NAME}-1.32 && \
145-
ln -sf /usr/local/bin/${CMD_NAME}-1.32 /usr/local/bin/kubectl
146-
147-
ARG TIBCOP_VERSION
148-
ENV TIBCOP_VERSION=${TIBCOP_VERSION:-"0.9.0"}
149-
RUN CMD_NAME=tibcop && \
150-
curl -sSLo ${CMD_NAME}.tar.gz "https://github.com/TIBCOSoftware/platform-provisioner/releases/download/tibcop-cli-0.9.0/tibcop-cli-${TIBCOP_VERSION}-${TARGETOS}-${TARGETARCH}.tar.gz" && \
151-
mkdir -p /usr/local/bin/${CMD_NAME}-${TIBCOP_VERSION} && tar -xzf ${CMD_NAME}.tar.gz -C /usr/local/bin/${CMD_NAME}-${TIBCOP_VERSION} && rm -rf ${CMD_NAME}.tar.gz && \
152-
ln -sfn /usr/local/bin/${CMD_NAME}-${TIBCOP_VERSION}/${CMD_NAME}/bin/${CMD_NAME} /usr/local/bin/${CMD_NAME}
141+
curl -sLO https://dl.k8s.io/release/${KUBECTL_VERSION_133}/bin/${TARGETOS}/${TARGETARCH}/${CMD_NAME} && \
142+
chmod +x ./${CMD_NAME} && mv -f ./${CMD_NAME} /usr/local/bin/${CMD_NAME}-1.33 && \
143+
ln -sf /usr/local/bin/${CMD_NAME}-1.33 /usr/local/bin/kubectl

‎docker/Dockerfile-tester-on-prem‎

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# Microsoft artifact is not multi-arch build. see: https://mcr.microsoft.com/en-us/artifact/mar/playwright/tags
1212
#FROM --platform=${BUILDPLATFORM} mcr.microsoft.com/playwright/python:v1.49.1-noble-${TARGETARCH}
1313
# Ubuntu 22.04 playwright release
14-
FROM --platform=${BUILDPLATFORM} mcr.microsoft.com/playwright/python:v1.49.1-jammy-${TARGETARCH}
14+
FROM --platform=${BUILDPLATFORM} mcr.microsoft.com/playwright/python:v1.54.0-jammy-${TARGETARCH}
1515

1616
ARG TARGETOS TARGETARCH
1717

@@ -23,7 +23,7 @@ RUN apt-get update && apt-get install -y \
2323

2424
# cue for yaml validation https://github.com/cue-lang/cue/releases
2525
ARG CUE_VERSION
26-
ENV CUE_VERSION=${CUE_VERSION:-"v0.12.0"}
26+
ENV CUE_VERSION=${CUE_VERSION:-"v0.14.1"}
2727
RUN CMD_NAME=cue && \
2828
curl --silent --location "https://github.com/cue-lang/cue/releases/download/${CUE_VERSION}/${CMD_NAME}_${CUE_VERSION}_${TARGETOS}_${TARGETARCH}.tar.gz" | tar xz -C /tmp && \
2929
chmod +x /tmp/${CMD_NAME} && mv /tmp/${CMD_NAME} /usr/local/bin/${CMD_NAME}-${CUE_VERSION} && \
@@ -32,7 +32,7 @@ RUN CMD_NAME=cue && \
3232

3333
# yq 4 utility https://github.com/mikefarah/yq/releases
3434
ARG YQ_VERSION_440
35-
ENV YQ_VERSION_440=${YQ_VERSION_440:-"v4.45.1"}
35+
ENV YQ_VERSION_440=${YQ_VERSION_440:-"v4.47.1"}
3636
RUN CMD_NAME=yq && \
3737
curl -sSLo /usr/local/bin/${CMD_NAME}-4.40 "https://github.com/mikefarah/${CMD_NAME}/releases/download/${YQ_VERSION_440}/${CMD_NAME}_${TARGETOS}_${TARGETARCH}" && \
3838
chmod +x /usr/local/bin/${CMD_NAME}-4.40 && \
@@ -43,26 +43,17 @@ RUN ln -sf /usr/local/bin/yq /usr/local/bin/yq4
4343

4444
# helm https://github.com/helm/helm/releases
4545
# ubuntu bug must add -k for curl or use wget: https://bugs.launchpad.net/ubuntu/+source/curl/+bug/2073448
46-
ARG HELM_VERSION_317
47-
ENV HELM_VERSION_317=${HELM_VERSION_317:-"v3.17.1"}
46+
ARG HELM_VERSION_318
47+
ENV HELM_VERSION_318=${HELM_VERSION_318:-"v3.18.5"}
4848
RUN CMD_NAME=helm && \
49-
curl -k --silent --location "https://get.helm.sh/${CMD_NAME}-${HELM_VERSION_317}-${TARGETOS}-${TARGETARCH}.tar.gz" | tar xz -C /tmp && \
50-
# wget -q "https://get.helm.sh/${CMD_NAME}-${HELM_VERSION_317}-${TARGETOS}-${TARGETARCH}.tar.gz" -O /tmp/helm.tar.gz && \
51-
# tar xz -f /tmp/helm.tar.gz -C /tmp && \
52-
chmod +x /tmp/${TARGETOS}-${TARGETARCH}/${CMD_NAME} && mv -f /tmp/${TARGETOS}-${TARGETARCH}/${CMD_NAME} /usr/local/bin/${CMD_NAME}-3.17 && \
53-
ln -sf /usr/local/bin/${CMD_NAME}-3.17 /usr/local/bin/helm
49+
curl -k --silent --location "https://get.helm.sh/${CMD_NAME}-${HELM_VERSION_318}-${TARGETOS}-${TARGETARCH}.tar.gz" | tar xz -C /tmp && \
50+
chmod +x /tmp/${TARGETOS}-${TARGETARCH}/${CMD_NAME} && mv -f /tmp/${TARGETOS}-${TARGETARCH}/${CMD_NAME} /usr/local/bin/${CMD_NAME}-3.18 && \
51+
ln -sf /usr/local/bin/${CMD_NAME}-3.18 /usr/local/bin/helm
5452

5553
# kubectl https://kubernetes.io/releases/
56-
ARG KUBECTL_VERSION_132
57-
ENV KUBECTL_VERSION_132=${KUBECTL_VERSION_132:-"v1.32.1"}
54+
ARG KUBECTL_VERSION_133
55+
ENV KUBECTL_VERSION_133=${KUBECTL_VERSION_133:-"v1.33.4"}
5856
RUN CMD_NAME=kubectl && \
59-
curl -sLO https://dl.k8s.io/release/${KUBECTL_VERSION_132}/bin/${TARGETOS}/${TARGETARCH}/${CMD_NAME} && \
60-
chmod +x ./${CMD_NAME} && mv -f ./${CMD_NAME} /usr/local/bin/${CMD_NAME}-1.32 && \
61-
ln -sf /usr/local/bin/${CMD_NAME}-1.32 /usr/local/bin/kubectl
62-
63-
ARG TIBCOP_VERSION
64-
ENV TIBCOP_VERSION=${TIBCOP_VERSION:-"0.9.0"}
65-
RUN CMD_NAME=tibcop && \
66-
curl -sSLo ${CMD_NAME}.tar.gz "https://github.com/TIBCOSoftware/platform-provisioner/releases/download/tibcop-cli-0.9.0/tibcop-cli-${TIBCOP_VERSION}-${TARGETOS}-${TARGETARCH}.tar.gz" && \
67-
mkdir -p /usr/local/bin/${CMD_NAME}-${TIBCOP_VERSION} && tar -xzf ${CMD_NAME}.tar.gz -C /usr/local/bin/${CMD_NAME}-${TIBCOP_VERSION} && rm -rf ${CMD_NAME}.tar.gz && \
68-
ln -sfn /usr/local/bin/${CMD_NAME}-${TIBCOP_VERSION}/${CMD_NAME}/bin/${CMD_NAME} /usr/local/bin/${CMD_NAME}
57+
curl -sLO https://dl.k8s.io/release/${KUBECTL_VERSION_133}/bin/${TARGETOS}/${TARGETARCH}/${CMD_NAME} && \
58+
chmod +x ./${CMD_NAME} && mv -f ./${CMD_NAME} /usr/local/bin/${CMD_NAME}-1.33 && \
59+
ln -sf /usr/local/bin/${CMD_NAME}-1.33 /usr/local/bin/kubectl

‎docker/README.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,21 @@ cd docker
4343
```
4444
This will build the Docker image called `<your Docker registry repo>/platform-provisioner:latest` and push to remote Docker registry.
4545

46+
To validate the Docker image, you can run the following command:
47+
48+
```bash
49+
export PIPELINE_INPUT_RECIPE="../docs/recipes/tests/test-container-binaries.yaml"
50+
export PIPELINE_DOCKER_IMAGE="platform-provisioner:latest"
51+
../dev/platform-provisioner.sh
52+
```
53+
54+
To build other docker images, you can set the `DOCKER_IMAGE` environment variable to the desired image name. For example, to build the `platform-provisioner:on-prem` image, run the following command:
55+
56+
```bash
57+
export DOCKERFILE="Dockerfile-on-prem"
58+
export IMAGE_TAG="on-prem"
59+
./build.sh
60+
```
4661
</details>
4762

4863
> [!Note]

0 commit comments

Comments
 (0)