Skip to content

Commit

Permalink
Update other go declarations to latest final versions
Browse files Browse the repository at this point in the history
  • Loading branch information
mhutchinson committed Jan 17, 2024
1 parent 7b1a96d commit c27b718
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions binary_transparency/firmware/cmd/ft_personality/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20.5-buster@sha256:eb3f9ac805435c1b2c965d63ce460988e1000058e1f67881324746362baf9572 AS builder
FROM golang:1.21.6-bullseye@sha256:8d22d45396a5a19a3edeefd48ec23eb1d6b1bcf2205fe84caab41c2321f4374e AS builder
LABEL stage=builder

ARG GOFLAGS=""
Expand All @@ -19,7 +19,7 @@ COPY . .
RUN go build ./binary_transparency/firmware/cmd/ft_personality

# Build release image
FROM golang:1.20.5-buster@sha256:eb3f9ac805435c1b2c965d63ce460988e1000058e1f67881324746362baf9572
FROM golang:1.21.6-bullseye@sha256:8d22d45396a5a19a3edeefd48ec23eb1d6b1bcf2205fe84caab41c2321f4374e

COPY --from=builder /build/ft_personality /bin/ft_personality
ENTRYPOINT ["/bin/ft_personality"]
4 changes: 2 additions & 2 deletions binary_transparency/firmware/cmd/ftmapserver/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20.5-buster@sha256:eb3f9ac805435c1b2c965d63ce460988e1000058e1f67881324746362baf9572 AS builder
FROM golang:1.21.6-bullseye@sha256:8d22d45396a5a19a3edeefd48ec23eb1d6b1bcf2205fe84caab41c2321f4374e AS builder
LABEL stage=builder

ARG GOFLAGS=""
Expand All @@ -19,7 +19,7 @@ COPY . .
RUN go build ./binary_transparency/firmware/cmd/ftmapserver

# Build release image
FROM golang:1.20.5-buster@sha256:eb3f9ac805435c1b2c965d63ce460988e1000058e1f67881324746362baf9572
FROM golang:1.21.6-bullseye@sha256:8d22d45396a5a19a3edeefd48ec23eb1d6b1bcf2205fe84caab41c2321f4374e

COPY --from=builder /build/ftmapserver /bin/ftmapserver
ENTRYPOINT ["/bin/ftmapserver"]
4 changes: 2 additions & 2 deletions integration/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This Dockerfile builds a base image for the CloudBuild integration testing.
FROM golang:1.20-buster@sha256:eb3f9ac805435c1b2c965d63ce460988e1000058e1f67881324746362baf9572 as testbase
FROM golang:1.21.6-bullseye@sha256:8d22d45396a5a19a3edeefd48ec23eb1d6b1bcf2205fe84caab41c2321f4374e AS testbase

WORKDIR /testbase

Expand All @@ -20,7 +20,7 @@ RUN mkdir protoc && \
# Tamago bits
RUN apt-get -y install binutils-arm-none-eabi build-essential make u-boot-tools && \
apt-get -y install -t buster-backports fuse fuse2fs
RUN curl -sfL https://github.com/usbarmory/tamago-go/releases/download/tamago-go1.20.2/tamago-go1.20.2.linux-amd64.tar.gz | tar -xzf - -C /
RUN curl -sfL https://github.com/usbarmory/tamago-go/releases/download/tamago-go1.21.6/tamago-go1.21.6.linux-amd64.tar.gz | tar -xzf - -C /
ENV TAMAGO=/usr/local/tamago-go/bin/go

ENV GOPATH /go
Expand Down

0 comments on commit c27b718

Please sign in to comment.