Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Go version in Docker base images to 1.20.8-bookworm #3094

Merged
merged 4 commits into from
Sep 12, 2023
Merged

Bump Go version in Docker base images to 1.20.8-bookworm #3094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c981cfc
Bump Go version in Docker base images to 1.20.8-bookworm
roger2hk Sep 11, 2023
d82409c
Replace netcat with netcat-openbsd
roger2hk Sep 11, 2023
c4aa2de
Update minimal images from gcr.io/distroless/base to gcr.io/distroles…
roger2hk Sep 11, 2023
8c9f1ad
Bump gcr.io/kaniko-project/executor from 1.6.0 to 1.15.0
roger2hk Sep 11, 2023
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
6 changes: 3 additions & 3 deletions cloudbuild_pr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ steps:
- tag_mysql

- id: build_db_server
name: gcr.io/kaniko-project/executor:v1.6.0
name: gcr.io/kaniko-project/executor:v1.15.0
args:
- --dockerfile=examples/deployment/docker/db_server/Dockerfile
- --destination=gcr.io/${PROJECT_ID}/db_server:${COMMIT_SHA}
Expand All @@ -45,15 +45,15 @@ steps:
- push_mysql

- id: build_log_server
name: gcr.io/kaniko-project/executor:v1.6.0
name: gcr.io/kaniko-project/executor:v1.15.0
args:
- --dockerfile=examples/deployment/docker/log_server/Dockerfile
- --destination=gcr.io/${PROJECT_ID}/log_server:${COMMIT_SHA}
- --cache=true
- --cache-dir= # Cache is in Google Container Registry
waitFor: ['-']
- id: build_log_signer
name: gcr.io/kaniko-project/executor:v1.6.0
name: gcr.io/kaniko-project/executor:v1.15.0
args:
- --dockerfile=examples/deployment/docker/log_signer/Dockerfile
- --destination=gcr.io/${PROJECT_ID}/log_signer:${COMMIT_SHA}
Expand Down
2 changes: 1 addition & 1 deletion examples/deployment/docker/db_client/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20-buster@sha256:eb3f9ac805435c1b2c965d63ce460988e1000058e1f67881324746362baf9572
FROM golang:1.20.8-bookworm@sha256:b099af7250d673d249597b79049e3e53487c435acf285e07a36d4b49f9f4750a

RUN apt-get update && \
apt-get install -y mariadb-client
Expand Down
4 changes: 2 additions & 2 deletions examples/deployment/docker/log_server/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20-buster@sha256:eb3f9ac805435c1b2c965d63ce460988e1000058e1f67881324746362baf9572 as build
FROM golang:1.20.8-bookworm@sha256:b099af7250d673d249597b79049e3e53487c435acf285e07a36d4b49f9f4750a as build

WORKDIR /trillian

Expand All @@ -18,7 +18,7 @@ RUN go install ./cmd/trillian_log_server
RUN go run github.com/google/go-licenses save ./cmd/trillian_log_server --save_path /THIRD_PARTY_NOTICES

# Make a minimal image.
FROM gcr.io/distroless/base@sha256:46c5b9bd3e3efff512e28350766b54355fce6337a0b44ba3f822ab918eca4520
FROM gcr.io/distroless/base-debian12@sha256:d64f5483d2fd0cec2260941c443cb2947102e46e1a9fe36a321d0a788c1a49e0

COPY --from=build /go/bin/trillian_log_server /
COPY --from=build /THIRD_PARTY_NOTICES /THIRD_PARTY_NOTICES
Expand Down
4 changes: 2 additions & 2 deletions examples/deployment/docker/log_signer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20-buster@sha256:eb3f9ac805435c1b2c965d63ce460988e1000058e1f67881324746362baf9572 as build
FROM golang:1.20.8-bookworm@sha256:b099af7250d673d249597b79049e3e53487c435acf285e07a36d4b49f9f4750a as build

WORKDIR /trillian

Expand All @@ -18,7 +18,7 @@ RUN go install ./cmd/trillian_log_signer
RUN go run github.com/google/go-licenses save ./cmd/trillian_log_signer --save_path /THIRD_PARTY_NOTICES

# Make a minimal image.
FROM gcr.io/distroless/base@sha256:46c5b9bd3e3efff512e28350766b54355fce6337a0b44ba3f822ab918eca4520
FROM gcr.io/distroless/base-debian12@sha256:d64f5483d2fd0cec2260941c443cb2947102e46e1a9fe36a321d0a788c1a49e0

COPY --from=build /go/bin/trillian_log_signer /
COPY --from=build /THIRD_PARTY_NOTICES /THIRD_PARTY_NOTICES
Expand Down
4 changes: 2 additions & 2 deletions integration/cloudbuild/testbase/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This Dockerfile builds a base image for Trillan integration tests.
FROM golang:1.20-buster@sha256:eb3f9ac805435c1b2c965d63ce460988e1000058e1f67881324746362baf9572
FROM golang:1.20.8-bookworm@sha256:b099af7250d673d249597b79049e3e53487c435acf285e07a36d4b49f9f4750a

WORKDIR /testbase

Expand All @@ -13,7 +13,7 @@ RUN apt-get update && apt-get install -y \
docker-compose \
lsof \
mariadb-client \
netcat \
netcat-openbsd \
socat \
softhsm \
unzip \
Expand Down