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(deps): Bump docker/buildx-bin from 0.13.1 to 0.14.0 in /ci-builder #765

Merged
merged 6 commits into from
May 10, 2024
Merged

build(deps): Bump docker/buildx-bin from 0.13.1 to 0.14.0 in /ci-builder #765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9ec5651
build(deps): Bump docker/buildx-bin from 0.13.1 to 0.14.0 in /ci-builder
dependabot[bot] May 8, 2024
8c5e479
updates
hairyhenderson May 10, 2024
f9debec
chore: remove cc-test-reporter binary
hairyhenderson May 10, 2024
7acb21b
use hashicorp dockerhub repo for vault and consul
hairyhenderson May 10, 2024
37bc3ea
ignoring more things
hairyhenderson May 10, 2024
1a6fb06
gomplate v4
hairyhenderson May 10, 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
4 changes: 4 additions & 0 deletions .trivyignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,7 @@ CVE-2023-39325
GHSA-9763-4f94-gfch
CVE-2023-49569
CVE-2023-49568
CVE-2023-45288

# golangci-lint - not relevant
CVE-2024-24788
24 changes: 4 additions & 20 deletions ci-builder/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,9 @@
FROM vault:1.13.3 AS vault
FROM consul:1.15.4 AS consul
FROM hashicorp/vault:1.16.2 AS vault
FROM hashicorp/consul:1.18.1 AS consul
FROM docker:26.1 AS docker
FROM ghcr.io/hairyhenderson/bashbrew:latest AS bashbrew
FROM docker/buildx-bin:0.13.1 AS buildx-plugin
FROM golangci/golangci-lint:v1.58.0-alpine AS golangci-lint

FROM alpine:3.19 AS cc-test-reporter

RUN set -eux; \
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
x86_64) \
wget -qO /bin/cc-test-reporter https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 \
;; \
*) \
echo >&2 "error: unsupported architecture ($apkArch), skipping"; \
echo -ne "#!/bin/sh\necho not on this arch!\n" > /bin/cc-test-reporter \
;; \
esac; \
chmod +x /bin/cc-test-reporter
FROM docker/buildx-bin:0.14.0 AS buildx-plugin
FROM golangci/golangci-lint:v1.58.1-alpine AS golangci-lint

FROM golang:1.22-alpine AS go-junit-report
RUN go install github.com/jstemmer/go-junit-report@latest
Expand All @@ -43,7 +28,6 @@ COPY --from=golangci-lint /usr/bin/golangci-lint /bin/
COPY --from=vault /bin/vault /bin/vault
COPY --from=consul /bin/consul /bin/consul
COPY --from=docker /usr/local/bin/docker /bin/docker
COPY --from=cc-test-reporter /bin/cc-test-reporter /bin/cc-test-reporter
COPY --from=go-junit-report /go/bin/go-junit-report /bin/go-junit-report
COPY --from=buildx-plugin /buildx /usr/libexec/docker/cli-plugins/docker-buildx
COPY --from=bashbrew /bin/bashbrew /bin/bashbrew
4 changes: 2 additions & 2 deletions dockerfiles-builder/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ghcr.io/hairyhenderson/gomplate:v3 AS gomplate
FROM ghcr.io/hairyhenderson/gomplate:v4.0.0-pre-2 AS gomplate
FROM ghcr.io/hairyhenderson/bashbrew:latest AS bashbrew
FROM docker:26.1 AS docker
FROM docker/buildx-bin:0.13.1 AS buildx-plugin
FROM docker/buildx-bin:0.14.0 AS buildx-plugin
FROM mikefarah/yq:4 AS yq

FROM alpine:3.19 AS runtime
Expand Down
24 changes: 4 additions & 20 deletions gomplate-ci-build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,9 @@
FROM vault:1.13.3 AS vault
FROM consul:1.15.4 AS consul
FROM docker:26.0 AS docker
FROM hashicorp/vault:1.16.2 AS vault
FROM hashicorp/consul:1.18.1 AS consul
FROM docker:26.1 AS docker
FROM ghcr.io/hairyhenderson/bashbrew:latest AS bashbrew
FROM docker/buildx-bin:0.14.0 AS buildx-plugin
FROM golangci/golangci-lint:v1.57.1-alpine AS golangci-lint

FROM alpine:3.19 AS cc-test-reporter

RUN set -eux; \
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
x86_64) \
wget -qO /bin/cc-test-reporter https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 \
;; \
*) \
echo >&2 "error: unsupported architecture ($apkArch), skipping"; \
echo -ne "#!/bin/sh\necho not on this arch!\n" > /bin/cc-test-reporter \
;; \
esac; \
chmod +x /bin/cc-test-reporter
FROM golangci/golangci-lint:v1.58.1-alpine AS golangci-lint

FROM golang:1.22 AS go-junit-report
RUN go install github.com/jstemmer/go-junit-report@latest
Expand All @@ -45,7 +30,6 @@ COPY --from=golangci-lint /usr/bin/golangci-lint /bin/
COPY --from=vault /bin/vault /bin/vault
COPY --from=consul /bin/consul /bin/consul
COPY --from=docker /usr/local/bin/docker /bin/docker
COPY --from=cc-test-reporter /bin/cc-test-reporter /bin/cc-test-reporter
COPY --from=go-junit-report /go/bin/go-junit-report /bin/go-junit-report
COPY --from=buildx-plugin /buildx /usr/libexec/docker/cli-plugins/docker-buildx
COPY --from=bashbrew /bin/bashbrew /bin/bashbrew
2 changes: 1 addition & 1 deletion raspbian/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:11 AS build
FROM debian:12 AS build

ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update
Expand Down