Merge pull request #453 from qlik-oss/amirravandi-sredev-13493

Tiny-build - Update dependency versions
qlik-oss · Jan 11, 2024 · 33c8167 · 33c8167
2 parents af53eac + 0138684
commit 33c8167
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 66 deletions.
diff --git a/go-build/Dockerfile b/go-build/Dockerfile
@@ -1,23 +1,23 @@
-FROM hairyhenderson/gomplate:v3.10.0-slim AS gomplate
+FROM hairyhenderson/gomplate:v3.11.6-slim AS gomplate
 FROM docker:23.0.1 AS docker
 FROM docker/compose:1.29.2 AS compose
 FROM vault:1.9.3 AS vault
-FROM hashicorp/terraform:1.1.5 AS terraform
+FROM hashicorp/terraform:1.6.6 AS terraform
 FROM hashicorp/packer:1.7.10 AS packer
-FROM prom/prometheus:v2.33.1 AS prometheus
-FROM prom/alertmanager:v0.23.0 AS alertmanager
-FROM mikefarah/yq:4.18.1 AS yq
-FROM lachlanevenson/k8s-kubectl:v1.21.9 AS kubectl
+FROM prom/prometheus:v2.41.0 AS prometheus
+FROM prom/alertmanager:v0.24.0 AS alertmanager
+FROM mikefarah/yq:4.31.2 AS yq
+FROM lachlanevenson/k8s-kubectl:v1.25.4 AS kubectl
 FROM lachlanevenson/k8s-helm:v3.10.2 AS helm2
-FROM lachlanevenson/k8s-helm:v3.8.0 AS helm
+FROM lachlanevenson/k8s-helm:v3.10.2 AS helm
 FROM golangci/golangci-lint:v1.44.0-alpine AS golangci-lint
 
-FROM alpine:3.18 AS cc-test-reporter
+FROM alpine:3.19 AS cc-test-reporter
 
 RUN wget -q -O /bin/cc-test-reporter https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64
 RUN chmod +x /bin/cc-test-reporter
 
-FROM alpine:3.18 AS packages
+FROM alpine:3.19 AS packages
 
 RUN apk add --no-cache \
     zip \
@@ -42,7 +42,7 @@ ENV GLIBC=2.35-r1
 RUN wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub
 
 COPY awscli-requirements.txt requirements.txt
-RUN pip install -r requirements.txt
+RUN pip install -r requirements.txt --break-system-packages
 RUN rm -rf requirements.txt ~/.cache
 
 RUN wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/$GLIBC/glibc-$GLIBC.apk \

diff --git a/go-build/awscli-requirements.txt b/go-build/awscli-requirements.txt
@@ -1,12 +1,14 @@
-awscli==1.22.47
-botocore==1.23.47
-colorama==0.4.3
-docutils==0.15.2
-jmespath==0.10.0
-pyasn1==0.4.8
+awscli==1.32.16
+botocore==1.34.16
+colorama==0.4.4
+docutils==0.16
+jmespath==1.0.1
+pyasn1==0.5.1
 python-dateutil==2.8.2
-PyYAML==5.4.1
+PyYAML==6.0.1
 rsa==4.7.2
-s3transfer==0.5.1
+s3transfer==0.10.0
 six==1.16.0
-urllib3==1.26.8
+urllib3==2.0.7
+yamllint==1.33.0
+requests==2.31.0
diff --git a/node-build/Dockerfile b/node-build/Dockerfile
@@ -1,22 +1,22 @@
-FROM hairyhenderson/gomplate:v3.8.0-slim AS gomplate
+FROM hairyhenderson/gomplate:v3.11.6-slim AS gomplate
 FROM docker:23.0.1 AS docker
-FROM docker/compose:1.27.4 AS compose
-FROM vault:1.7.3 AS vault
-FROM hashicorp/terraform:1.0.0 AS terraform
-FROM hashicorp/packer:1.6.6 AS packer
-FROM prom/prometheus:v2.23.0 AS prometheus
-FROM prom/alertmanager:v0.21.0 AS alertmanager
-FROM mikefarah/yq:4.9.6 AS yq
-FROM lachlanevenson/k8s-kubectl:v1.20.1 AS kubectl
+FROM docker/compose:1.29.2 AS compose
+FROM vault:1.9.3 AS vault
+FROM hashicorp/terraform:1.6.6 AS terraform
+FROM hashicorp/packer:1.7.10 AS packer
+FROM prom/prometheus:v2.41.0 AS prometheus
+FROM prom/alertmanager:v0.24.0 AS alertmanager
+FROM mikefarah/yq:4.31.2 AS yq
+FROM lachlanevenson/k8s-kubectl:v1.25.4 AS kubectl
 FROM lachlanevenson/k8s-helm:v3.10.2 AS helm2
-FROM lachlanevenson/k8s-helm:v3.8.0 AS helm
+FROM lachlanevenson/k8s-helm:v3.10.2 AS helm
 
-FROM alpine:3.12.3 AS cc-test-reporter
+FROM alpine:3.19 AS cc-test-reporter
 
 RUN wget -q -O /bin/cc-test-reporter https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64
 RUN chmod +x /bin/cc-test-reporter
 
-FROM alpine:3.12.3 AS packages
+FROM alpine:3.19 AS packages
 
 RUN apk add --no-cache \
     zip \
@@ -35,12 +35,12 @@ RUN apk add --no-cache \
     openssl \
     libgcc
 
-ENV GLIBC=2.31-r0
+ENV GLIBC=2.35-r1
 
 RUN wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub
 
 COPY awscli-requirements.txt requirements.txt
-RUN pip install -r requirements.txt
+RUN pip install -r requirements.txt --break-system-packages
 RUN rm -rf requirements.txt ~/.cache
 
 RUN wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/$GLIBC/glibc-$GLIBC.apk \

diff --git a/node-build/awscli-requirements.txt b/node-build/awscli-requirements.txt
@@ -1,13 +1,14 @@
-awscli==1.19.58
-botocore==1.20.58
+awscli==1.32.16
+botocore==1.34.16
 colorama==0.4.4
-docutils==0.17.1
-jmespath==0.10.0
-pyasn1==0.4.8
-python-dateutil==2.8.1
-PyYAML==6.0
+docutils==0.16
+jmespath==1.0.1
+pyasn1==0.5.1
+python-dateutil==2.8.2
+PyYAML==6.0.1
 rsa==4.7.2
-s3transfer==0.4.2
-six==1.15.0
-urllib3==1.26.5
-yamllint==1.26.1
+s3transfer==0.10.0
+six==1.16.0
+urllib3==2.0.7
+yamllint==1.33.0
+requests==2.31.0
diff --git a/tiny-build/Dockerfile b/tiny-build/Dockerfile
@@ -1,26 +1,25 @@
-FROM hairyhenderson/gomplate:v3.11.4-slim AS gomplate
+FROM hairyhenderson/gomplate:v3.11.6-slim AS gomplate
 FROM docker:23.0.1 AS docker
-FROM docker/compose:1.27.4 AS compose
-FROM vault:1.6.1 AS vault
-FROM hashicorp/terraform:1.0.0 AS terraform
-FROM hashicorp/packer:1.6.6 AS packer
+FROM docker/compose:1.29.2 AS compose
+FROM vault:1.9.3 AS vault
+FROM hashicorp/terraform:1.6.6 AS terraform
+FROM hashicorp/packer:1.7.10 AS packer
 FROM prom/prometheus:v2.41.0 AS prometheus
 FROM prom/alertmanager:v0.24.0 AS alertmanager
 FROM grafana/cortex-tools:v0.10.7 AS cortextool
 FROM mikefarah/yq:4.31.2 AS yq
-FROM lachlanevenson/k8s-kubectl:v1.22.16 AS kubectl
+FROM lachlanevenson/k8s-kubectl:v1.25.4 AS kubectl
 FROM lachlanevenson/k8s-helm:v3.10.2 AS helm2
 FROM lachlanevenson/k8s-helm:v3.10.2 AS helm
-FROM r.j3ss.co/img:v0.5.11 AS img
 FROM gcr.io/google.com/cloudsdktool/cloud-sdk:371.0.0-alpine AS google-cloud-sdk
 FROM instrumenta/conftest:v0.21.0 AS conftest
 
-FROM alpine:3.14.0 AS cc-test-reporter
+FROM alpine:3.19 AS cc-test-reporter
 
 RUN wget -q -O /bin/cc-test-reporter https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64
 RUN chmod +x /bin/cc-test-reporter
 
-FROM alpine:3.14.0 AS packages
+FROM alpine:3.19 AS packages
 
 RUN apk add --no-cache \
     make \
@@ -34,12 +33,12 @@ RUN apk add --no-cache \
     openssh \
     github-cli
 
-ENV GLIBC=2.34-r0
+ENV GLIBC=2.35-r1
 
 RUN wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub
 
 COPY awscli-requirements.txt requirements.txt
-RUN pip3 install -r requirements.txt
+RUN pip3 install -r requirements.txt --break-system-packages
 RUN rm -rf requirements.txt ~/.cache
 
 RUN wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/$GLIBC/glibc-$GLIBC.apk \
@@ -57,7 +56,7 @@ RUN mkdir hub && \
 
 RUN ln -s /usr/local/bin/helm /usr/local/bin/helm3
 
-FROM alpine:3.14.3 AS build
+FROM alpine:3.19 AS build
 
 COPY --from=gomplate /gomplate /bin/gomplate
 COPY --from=docker /usr/local/bin/docker /bin/docker
@@ -77,7 +76,6 @@ COPY --from=google-cloud-sdk /google-cloud-sdk/bin/ /usr/local/bin/
 COPY --from=google-cloud-sdk /google-cloud-sdk/lib/ /usr/local/lib/
 COPY --from=google-cloud-sdk /google-cloud-sdk/platform/ /usr/local/platform/
 COPY --from=google-cloud-sdk /google-cloud-sdk/.install/ /usr/local/.install/
-COPY --from=img /usr/bin/img /usr/bin/img
 COPY --from=conftest /usr/local/bin/conftest /usr/local/bin/conftest
 
 COPY --from=packages / /
diff --git a/tiny-build/awscli-requirements.txt b/tiny-build/awscli-requirements.txt
@@ -1,14 +1,14 @@
-awscli==1.27.92
-botocore==1.29.92
+awscli==1.32.16
+botocore==1.34.16
 colorama==0.4.4
 docutils==0.16
 jmespath==1.0.1
-pyasn1==0.4.8
+pyasn1==0.5.1
 python-dateutil==2.8.2
-PyYAML==5.4.1
+PyYAML==6.0.1
 rsa==4.7.2
-s3transfer==0.6.0
-six==1.15.0
-urllib3==1.26.14
-yamllint==1.29.0
-requests==2.28.2
+s3transfer==0.10.0
+six==1.16.0
+urllib3==2.0.7
+yamllint==1.33.0
+requests==2.31.0