Skip to content
Snippets Groups Projects
Unverified Commit 47d53252 authored by dlorenc's avatar dlorenc Committed by GitHub
Browse files

Switch the trillian containers to multi-plat builds. (#547)


This also adds the ko targets for building them, and entries
to tools.go so go.mod recognizes these dependencies so we can build
them with ko.

Signed-off-by: default avatarDan Lorenc <lorenc.d@gmail.com>
parent 9df041b2
No related branches found
No related tags found
No related merge requests found
......@@ -139,6 +139,17 @@ ko-local:
--tags $(GIT_VERSION) --tags $(GIT_HASH) --local \
github.com/sigstore/rekor/cmd/rekor-cli
# This builds the trillian containers we rely on using ko for cross platform support
.PHONY: ko-trillian
ko-trillian:
LDFLAGS="$(SERVER_LDFLAGS)" GIT_HASH=$(GIT_HASH) GIT_VERSION=$(GIT_VERSION) \
ko publish --base-import-paths --bare \
--platform=all --tags $(GIT_VERSION) --tags $(GIT_HASH) \
github.com/google/trillian/cmd/trillian_log_signer
ko publish --base-import-paths --bare \
--platform=all --tags $(GIT_VERSION) --tags $(GIT_HASH) \
github.com/google/trillian/cmd/trillian_log_server
## --------------------------------------
## Tooling Binaries
......
......@@ -16,6 +16,7 @@
version: '3.4'
services:
mysql:
platform: linux/amd64
image: gcr.io/trillian-opensource-ci/db_server:v1.4.0
environment:
- MYSQL_ROOT_PASSWORD=zaphod
......@@ -45,7 +46,7 @@ services:
retries: 3
start_period: 5s
trillian-log-server:
image: gcr.io/trillian-opensource-ci/log_server:v1.4.0
image: gcr.io/projectsigstore/trillian_log_server@sha256:f850a0defd089ea844822030c67ae05bc93c91168a7dd4aceb0b6648c39f696b
command: [
"--storage_system=mysql",
"--mysql_uri=test:zaphod@tcp(mysql:3306)/test",
......@@ -60,7 +61,7 @@ services:
depends_on:
- mysql
trillian-log-signer:
image: gcr.io/trillian-opensource-ci/log_signer:v1.4.0
image: gcr.io/projectsigstore/trillian_log_signer@sha256:fe90d523f6617974f70878918e4b31d49b2b46a86024bb2d6b01d2bbfed8edbf
command: [
"--storage_system=mysql",
"--mysql_uri=test:zaphod@tcp(mysql:3306)/test",
......
//go:build tools
// +build tools
// Copyright 2021 The Sigstore Authors.
......@@ -24,4 +25,8 @@ import (
_ "github.com/dvyukov/go-fuzz/go-fuzz-build"
_ "github.com/dvyukov/go-fuzz/go-fuzz-dep"
_ "github.com/go-swagger/go-swagger/cmd/swagger"
// These are so we can build these two binaries into containers with ko
_ "github.com/google/trillian/cmd/trillian_log_server"
_ "github.com/google/trillian/cmd/trillian_log_signer"
)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment