Skip to content

Commit

Permalink
update dependencies
Browse files Browse the repository at this point in the history
Signed-off-by: Masaru Hoshi <masaru.hoshi@qlik.com>
  • Loading branch information
masaruhoshi committed Jan 11, 2024
1 parent a3fdba8 commit 0138684
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 47 deletions.
20 changes: 10 additions & 10 deletions go-build/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand All @@ -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 \
Expand Down
20 changes: 11 additions & 9 deletions go-build/awscli-requirements.txt
Original file line number Diff line number Diff line change
@@ -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
28 changes: 14 additions & 14 deletions node-build/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand All @@ -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 \
Expand Down
23 changes: 12 additions & 11 deletions node-build/awscli-requirements.txt
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions tiny-build/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
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 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.6.6 AS packer
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
Expand Down

0 comments on commit 0138684

Please sign in to comment.