updates

Signed-off-by: Dave Henderson <dhenderson@gmail.com>

.trivyignore

@@ -20,3 +20,7 @@ CVE-2021-38561
 CVE-2021-44716
 CVE-2022-27664
 CVE-2022-32149
+
+# bashbrew - github.com/opencontainers/runc vulns - not relevant here
+CVE-2023-27561
+CVE-2023-28642

bashbrew/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.17
+FROM alpine:3.18
 
 LABEL org.opencontainers.image.source https://github.com/hairyhenderson/dockerfiles
 

ci-builder/Dockerfile

@@ -1,11 +1,11 @@
-FROM vault:1.13.1 AS vault
+FROM vault:1.13.2 AS vault
 FROM consul:1.15.2 AS consul
-FROM docker:23.0 AS docker
+FROM docker:24.0 AS docker
 FROM ghcr.io/hairyhenderson/bashbrew:latest AS bashbrew
 FROM docker/buildx-bin:0.10.4 AS buildx-plugin
 FROM golangci/golangci-lint:v1.52.2-alpine AS golangci-lint
 
-FROM alpine:3.17 AS cc-test-reporter
+FROM alpine:3.18 AS cc-test-reporter
 
 RUN set -eux; \
 	apkArch="$(apk --print-arch)"; \

dockerfiles-builder/Dockerfile

@@ -1,10 +1,10 @@
 FROM ghcr.io/hairyhenderson/gomplate:v3 AS gomplate
 FROM ghcr.io/hairyhenderson/bashbrew:latest AS bashbrew
-FROM docker:23.0 AS docker
+FROM docker:24.0 AS docker
 FROM docker/buildx-bin:0.10.4 AS buildx-plugin
 FROM mikefarah/yq:4 AS yq
 
-FROM alpine:3.17 AS runtime
+FROM alpine:3.18 AS runtime
 
 LABEL org.opencontainers.image.source https://github.com/hairyhenderson/dockerfiles
 

golang-air/Dockerfile

@@ -1,8 +1,12 @@
-FROM golang:1.20
+FROM golang:1.20 AS build
+
+RUN go install github.com/cosmtrek/air@latest
+
+FROM golang:1.20 AS runtime
 
 LABEL org.opencontainers.image.source https://github.com/hairyhenderson/dockerfiles
 
 # temporary workaround for CVEs in older versions of linux-libc-dev
 RUN apt-get update && apt-get upgrade -y linux-libc-dev
 
-RUN go install github.com/cosmtrek/air@latest
+COPY --from=build /go/bin/air /bin/air

gomplate-ci-build/Dockerfile

@@ -1,12 +1,12 @@
 ARG GO_VERSION=1.20
-FROM vault:1.13.1 AS vault
+FROM vault:1.13.2 AS vault
 FROM consul:1.15.2 AS consul
-FROM docker:23.0 AS docker
+FROM docker:24.0 AS docker
 FROM ghcr.io/hairyhenderson/bashbrew:latest AS bashbrew
 FROM docker/buildx-bin:0.10.4 AS buildx-plugin
 FROM golangci/golangci-lint:v1.52.2-alpine AS golangci-lint
 
-FROM alpine:3.17 AS cc-test-reporter
+FROM alpine:3.18 AS cc-test-reporter
 
 RUN set -eux; \
 	apkArch="$(apk --print-arch)"; \
@@ -35,6 +35,7 @@ RUN apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
 		unzip \
 		jq \
+	&& apt-get upgrade -y linux-libc-dev \
 	&& apt-get clean \
 	&& rm -rf /var/lib/apt/lists/*
 

man/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.17
+FROM alpine:3.18
 
 LABEL org.opencontainers.image.source https://github.com/hairyhenderson/dockerfiles
 

pi-blaster/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.17 as builder
+FROM alpine:3 as builder
 
 RUN apk add --no-cache \
     build-base \
@@ -14,7 +14,7 @@ RUN ./autogen.sh
 RUN ./configure
 RUN make
 
-FROM alpine:3.17
+FROM alpine:3
 
 COPY --from=builder /pi-blaster/pi-blaster /
 

sed/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.17
+FROM alpine:3.18
 
 LABEL org.opencontainers.image.source https://github.com/hairyhenderson/dockerfiles