Merge pull request #274 from dgageot/build-misc

Misc changes to the build

Author: dgageot

Dockerfile

@@ -3,13 +3,9 @@
 # xx is a helper for cross-compilation
 FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.7.0 AS xx
 
-FROM --platform=$BUILDPLATFORM golang:1.25.0-alpine3.22 AS base
-RUN apk add clang file
+FROM --platform=$BUILDPLATFORM golang:1.25.1-alpine3.22 AS builder-base
 COPY --from=xx / /
-ENV CGO_ENABLED=0
 WORKDIR /src
-
-FROM base AS builder-base
 RUN --mount=type=cache,target=/go/pkg/mod \
     --mount=type=bind,source=go.mod,target=go.mod \
     --mount=type=bind,source=go.sum,target=go.sum \
@@ -30,7 +26,6 @@ RUN --mount=type=cache,target=/root/.cache,id=docker-ai-$TARGETPLATFORM \
     --mount=type=secret,id=telemetry_header,env=TELEMETRY_HEADER <<EOT
     set -ex
     xx-go build -trimpath -ldflags "-s -w -X 'github.com/docker/cagent/pkg/version.Version=$GIT_TAG' -X 'github.com/docker/cagent/pkg/version.Commit=$GIT_COMMIT' -X 'github.com/docker/cagent/pkg/version.BuildTime=$BUILD_DATE' -X 'github.com/docker/cagent/pkg/telemetry.TelemetryEndpoint=$TELEMETRY_ENDPOINT' -X 'github.com/docker/cagent/pkg/telemetry.TelemetryAPIKey=$TELEMETRY_API_KEY' -X 'github.com/docker/cagent/pkg/telemetry.TelemetryHeader=$TELEMETRY_HEADER'" -o /binaries/cagent-$TARGETOS-$TARGETARCH .
-    file /binaries/cagent-$TARGETos-$TARGETARCH
     xx-verify --static /binaries/cagent-$TARGETOS-$TARGETARCH
     if [ "$TARGETOS" = "windows" ]; then
       mv /binaries/cagent-$TARGETOS-$TARGETARCH /binaries/cagent-$TARGETOS-$TARGETARCH.exe

Taskfile.yml

@@ -73,14 +73,23 @@ tasks:
     desc: Build and Push Docker image
     cmd: docker buildx build --push -t docker/cagent {{.BUILD_ARGS}} .
 
-  build-agents:
-    desc: Build Demo dockerized agents
+  push-agent:
+    desc: Build dockerized agent
+    internal: true
     vars:
       DOCKER_ID:
         sh: curl -s --unix-socket ~/Library/Containers/com.docker.docker/Data/backend.sock http://_/registry/info | jq -r .id
     depends: ["build"]
-    cmds:
-      - ./bin/cagent build --push ./examples/pirate.yaml {{.DOCKER_ID}}/cagent-pirate
-      - ./bin/cagent build --push ./examples/github.yaml {{.DOCKER_ID}}/cagent-github
-      - ./bin/cagent build --push ./examples/gopher.yaml {{.DOCKER_ID}}/cagent-gopher
-      - ./bin/cagent build --push ./examples/mem.yaml {{.DOCKER_ID}}/cagent-mem
+    cmd: ./bin/cagent build --push ./examples/{{.AGENT}}.yaml {{.DOCKER_ID}}/cagent-{{.AGENT}}
+
+  push-agents:
+    desc: Build dockerized agents
+    deps:
+      - task: push-agent
+        vars: { AGENT: 'pirate' }
+      - task: push-agent
+        vars: { AGENT: 'github' }
+      - task: push-agent
+        vars: { AGENT: 'gopher' }
+      - task: push-agent
+        vars: { AGENT: 'mem' }

go.mod

@@ -1,6 +1,6 @@
 module github.com/docker/cagent
 
-go 1.25.0
+go 1.25.1
 
 require (
 	dario.cat/mergo v1.0.2

pkg/environment/secrets_test.go

@@ -11,7 +11,7 @@ import (
 
 func writeSecret(value string) func(string) error {
 	return func(path string) error {
-		return os.WriteFile(path, []byte(value), 0700)
+		return os.WriteFile(path, []byte(value), 0o700)
 	}
 }