update go and docker-compose builder pins
This commit is contained in:
4 files changed
+6
-6
No files matched your search
+2
-2
@@ -37,7 +37,7 @@ RUN APKO_ARCH=$([ "$TARGETARCH" = "arm64" ] && echo "aarch64" || echo "x86_64")
|
|||||||
" - busybox" \
|
" - busybox" \
|
||||||
" - tzdata" \
|
" - tzdata" \
|
||||||
" - docker-cli" \
|
" - docker-cli" \
|
||||||
" - docker-compose=5.5.0-r2" \
|
" - docker-compose=5.5.0-r5" \
|
||||||
" - docker-cli-buildx" \
|
" - docker-cli-buildx" \
|
||||||
" - sqlite" \
|
" - sqlite" \
|
||||||
" - postgresql-client" \
|
" - postgresql-client" \
|
||||||
@@ -99,7 +99,7 @@ RUN cp -r node_modules/better-sqlite3/build /tmp/better-sqlite3-build \
|
|||||||
&& rm -rf node_modules/@types /tmp/better-sqlite3-build
|
&& rm -rf node_modules/@types /tmp/better-sqlite3-build
|
||||||
|
|
||||||
# Build Go collector
|
# Build Go collector
|
||||||
FROM --platform=$BUILDPLATFORM golang:1.25.13 AS go-builder
|
FROM --platform=$BUILDPLATFORM golang:1.26.8 AS go-builder
|
||||||
ARG TARGETARCH
|
ARG TARGETARCH
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY collector/ ./collector/
|
COPY collector/ ./collector/
|
||||||
|
|||||||
+1
-1
@@ -46,7 +46,7 @@ RUN cp -r node_modules/better-sqlite3/build /tmp/better-sqlite3-build \
|
|||||||
# -----------------------------------------------------------------------------
|
# -----------------------------------------------------------------------------
|
||||||
# Stage 2: Go Collector Builder
|
# Stage 2: Go Collector Builder
|
||||||
# -----------------------------------------------------------------------------
|
# -----------------------------------------------------------------------------
|
||||||
FROM golang:1.25.13 AS go-builder
|
FROM golang:1.26.8 AS go-builder
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY collector/ ./collector/
|
COPY collector/ ./collector/
|
||||||
RUN cd collector && CGO_ENABLED=0 go build -o /app/bin/collection-worker .
|
RUN cd collector && CGO_ENABLED=0 go build -o /app/bin/collection-worker .
|
||||||
|
|||||||
+2
-2
@@ -23,7 +23,7 @@
|
|||||||
# -----------------------------------------------------------------------------
|
# -----------------------------------------------------------------------------
|
||||||
# Alpine edge has docker-cli for riscv64 but NOT docker-compose.
|
# Alpine edge has docker-cli for riscv64 but NOT docker-compose.
|
||||||
# Build it from source since Go has excellent riscv64 cross-compilation.
|
# Build it from source since Go has excellent riscv64 cross-compilation.
|
||||||
FROM --platform=$BUILDPLATFORM golang:1.25.9-alpine AS compose-builder
|
FROM --platform=$BUILDPLATFORM golang:1.26.8-alpine AS compose-builder
|
||||||
ARG TARGETARCH
|
ARG TARGETARCH
|
||||||
|
|
||||||
RUN apk add --no-cache git
|
RUN apk add --no-cache git
|
||||||
@@ -72,7 +72,7 @@ RUN MAKEFLAGS="-j$(nproc)" npm ci --omit=dev --ignore-scripts \
|
|||||||
# -----------------------------------------------------------------------------
|
# -----------------------------------------------------------------------------
|
||||||
# Stage 4: Go Collector Builder (cross-compile from build platform)
|
# Stage 4: Go Collector Builder (cross-compile from build platform)
|
||||||
# -----------------------------------------------------------------------------
|
# -----------------------------------------------------------------------------
|
||||||
FROM --platform=$BUILDPLATFORM golang:1.25.13 AS go-builder
|
FROM --platform=$BUILDPLATFORM golang:1.26.8 AS go-builder
|
||||||
ARG TARGETARCH
|
ARG TARGETARCH
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY collector/ ./collector/
|
COPY collector/ ./collector/
|
||||||
|
|||||||
+1
-1
@@ -1,3 +1,3 @@
|
|||||||
module github.com/Finsys/dockhand/collector
|
module github.com/Finsys/dockhand/collector
|
||||||
|
|
||||||
go 1.25.13
|
go 1.26
|
||||||
Reference in new issue
Block a user