Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .drone/drone.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ local image_tag_for_cd() = {

local build_binaries(arch) = {
name: 'build-tempo-binaries',
image: 'golang:1.20-alpine',
image: 'golang:1.20.4-alpine',
commands: [
'apk --update --no-cache add make git bash',
] + [
Expand Down Expand Up @@ -226,7 +226,7 @@ local deploy_to_dev() = {
steps+: [
{
name: 'build-tempo-serverless',
image: 'golang:1.20-alpine',
image: 'golang:1.20.4-alpine',
commands: [
'apk add make git zip bash',
'./tools/image-tag | cut -d, -f 1 | tr A-Z a-z > .tags', // values in .tags are used by the next step when pushing the image
Expand Down Expand Up @@ -323,7 +323,7 @@ local deploy_to_dev() = {
},
{
name: 'write-key',
image: 'golang:1.20',
image: 'golang:1.20.4',
commands: ['printf "%s" "$NFPM_SIGNING_KEY" > $NFPM_SIGNING_KEY_FILE'],
environment: {
NFPM_SIGNING_KEY: { from_secret: gpg_private_key.name },
Expand All @@ -332,7 +332,7 @@ local deploy_to_dev() = {
},
{
name: 'test release',
image: 'golang:1.20',
image: 'golang:1.20.4',
commands: ['make release-snapshot'],
environment: {
NFPM_DEFAULT_PASSPHRASE: { from_secret: gpg_passphrase.name },
Expand Down Expand Up @@ -365,7 +365,7 @@ local deploy_to_dev() = {
},
{
name: 'release',
image: 'golang:1.20',
image: 'golang:1.20.4',
commands: ['make release'],
environment: {
GITHUB_TOKEN: { from_secret: gh_token_secret.name },
Expand Down
14 changes: 7 additions & 7 deletions .drone/drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ steps:
- COMPONENT=tempo GOARCH=amd64 make exe
- COMPONENT=tempo-vulture GOARCH=amd64 make exe
- COMPONENT=tempo-query GOARCH=amd64 make exe
image: golang:1.20-alpine
image: golang:1.20.4-alpine
name: build-tempo-binaries
- image: plugins/docker
name: build-tempo-image
Expand Down Expand Up @@ -77,7 +77,7 @@ steps:
- COMPONENT=tempo GOARCH=arm64 make exe
- COMPONENT=tempo-vulture GOARCH=arm64 make exe
- COMPONENT=tempo-query GOARCH=arm64 make exe
image: golang:1.20-alpine
image: golang:1.20.4-alpine
name: build-tempo-binaries
- image: plugins/docker
name: build-tempo-image
Expand Down Expand Up @@ -235,7 +235,7 @@ steps:
- cd ./cmd/tempo-serverless
- make build-docker-gcr-binary
- make build-lambda-zip
image: golang:1.20-alpine
image: golang:1.20.4-alpine
name: build-tempo-serverless
- image: plugins/gcr
name: deploy-tempo-serverless-gcr
Expand Down Expand Up @@ -304,15 +304,15 @@ steps:
NFPM_SIGNING_KEY:
from_secret: gpg_private_key
NFPM_SIGNING_KEY_FILE: /drone/src/private-key.key
image: golang:1.20
image: golang:1.20.4
name: write-key
- commands:
- make release-snapshot
environment:
NFPM_DEFAULT_PASSPHRASE:
from_secret: gpg_passphrase
NFPM_SIGNING_KEY_FILE: /drone/src/private-key.key
image: golang:1.20
image: golang:1.20.4
name: test release
- commands:
- ./tools/packaging/verify-deb-install.sh
Expand All @@ -338,7 +338,7 @@ steps:
NFPM_DEFAULT_PASSPHRASE:
from_secret: gpg_passphrase
NFPM_SIGNING_KEY_FILE: /drone/src/private-key.key
image: golang:1.20
image: golang:1.20.4
name: release
when:
event:
Expand Down Expand Up @@ -422,6 +422,6 @@ kind: secret
name: gpg_passphrase
---
kind: signature
hmac: 74e4a96646f3ac2ec0e6083b07f789920e5bfba90043ac1ed62cd1e7c60026e6
hmac: a21cc231bbdc856bdf15cc27e5d4e9006d1cb2f1f295dfb20156fe0726934861

...
2 changes: 1 addition & 1 deletion cmd/tempo-serverless/lambda/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#
# build the lambda and retrive the lambda-local-proxy
#
FROM golang:1.20-buster AS build
FROM golang:1.20.4-buster AS build

# copy in the lambda. todo: build in container
COPY lambda /
Expand Down