From 27b1babbc06384c3e170b3cc0d256d1883013864 Mon Sep 17 00:00:00 2001 From: Boshi Lian Date: Tue, 25 Oct 2022 00:23:04 +0000 Subject: [PATCH] smaller image by keeping k8s and dir plug only --- Dockerfile | 3 ++- e2e/docker-compose.yml | 2 ++ plugin/azdevicecode/main.go | 2 ++ plugin/docker/docker.go | 2 ++ plugin/docker/main.go | 2 ++ plugin/fixed/main.go | 2 ++ plugin/simplemath/main.go | 2 ++ plugin/totp/main.go | 2 ++ plugin/workingdirbykey/main.go | 2 ++ plugin/yaml/main.go | 2 ++ plugin/yaml/yaml.go | 2 ++ 11 files changed, 22 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d5a70d4c..23bea693 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,14 @@ FROM golang:1.19-bullseye as builder ARG VER=devel +ARG BUILDTAGS="" ENV CGO_ENABLED=0 RUN mkdir -p /sshpiperd/plugins WORKDIR /src RUN --mount=target=/src,type=bind,source=. --mount=type=cache,target=/root/.cache/go-build go build -o /sshpiperd -ldflags "-X main.mainver=$VER" ./cmd/... -RUN --mount=target=/src,type=bind,source=. --mount=type=cache,target=/root/.cache/go-build go build -o /sshpiperd/plugins -ldflags "-X main.mainver=$VER" ./plugin/... +RUN --mount=target=/src,type=bind,source=. --mount=type=cache,target=/root/.cache/go-build go build -o /sshpiperd/plugins -tags "$BUILDTAGS" ./plugin/... ADD entrypoint.sh /sshpiperd FROM busybox diff --git a/e2e/docker-compose.yml b/e2e/docker-compose.yml index 3ba38b6f..d1ee2e80 100644 --- a/e2e/docker-compose.yml +++ b/e2e/docker-compose.yml @@ -68,6 +68,8 @@ services: build: context: ../ target: builder + args: + - BUILDTAGS=e2e volumes: - ..:/src - shared:/shared diff --git a/plugin/azdevicecode/main.go b/plugin/azdevicecode/main.go index cf70ab8c..8715a714 100644 --- a/plugin/azdevicecode/main.go +++ b/plugin/azdevicecode/main.go @@ -1,3 +1,5 @@ +//go:build full + package main import ( diff --git a/plugin/docker/docker.go b/plugin/docker/docker.go index f3fd9711..f153b873 100644 --- a/plugin/docker/docker.go +++ b/plugin/docker/docker.go @@ -1,3 +1,5 @@ +//go:build full || e2e + package main import ( diff --git a/plugin/docker/main.go b/plugin/docker/main.go index 98c4f22d..591368df 100644 --- a/plugin/docker/main.go +++ b/plugin/docker/main.go @@ -1,3 +1,5 @@ +//go:build full || e2e + package main import ( diff --git a/plugin/fixed/main.go b/plugin/fixed/main.go index 7067464f..ff928709 100644 --- a/plugin/fixed/main.go +++ b/plugin/fixed/main.go @@ -1,3 +1,5 @@ +//go:build full || e2e + package main import ( diff --git a/plugin/simplemath/main.go b/plugin/simplemath/main.go index a0e6e0f5..962a456b 100644 --- a/plugin/simplemath/main.go +++ b/plugin/simplemath/main.go @@ -1,3 +1,5 @@ +//go:build full + package main import ( diff --git a/plugin/totp/main.go b/plugin/totp/main.go index d1368c43..563c430e 100644 --- a/plugin/totp/main.go +++ b/plugin/totp/main.go @@ -1,3 +1,5 @@ +//go:build full + package main import ( diff --git a/plugin/workingdirbykey/main.go b/plugin/workingdirbykey/main.go index 42f849dc..6aa1f216 100644 --- a/plugin/workingdirbykey/main.go +++ b/plugin/workingdirbykey/main.go @@ -1,3 +1,5 @@ +//go:build full + package main import ( diff --git a/plugin/yaml/main.go b/plugin/yaml/main.go index ecd003eb..b0f22164 100644 --- a/plugin/yaml/main.go +++ b/plugin/yaml/main.go @@ -1,3 +1,5 @@ +//go:build full || e2e + package main import ( diff --git a/plugin/yaml/yaml.go b/plugin/yaml/yaml.go index 2ba387c3..67fe3936 100644 --- a/plugin/yaml/yaml.go +++ b/plugin/yaml/yaml.go @@ -1,3 +1,5 @@ +//go:build full || e2e + package main import (