Skip to content

Commit

Permalink
[base-images] Pin base-builder-swift instead of base-builder-new
Browse files Browse the repository at this point in the history
to fix breakage.

This is intended to fix the same breakage as
#6327. But this fix does
not prevent us from creating new language builder images that do
not use xenial.

Related: #6180
  • Loading branch information
jonathanmetzman committed Aug 27, 2021
1 parent 41a8efc commit 291a152
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion infra/base-images/base-builder-new/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#
################################################################################

FROM gcr.io/oss-fuzz-base/base-clang:xenial
FROM gcr.io/oss-fuzz-base/base-clang

RUN dpkg --add-architecture i386 && \
apt-get update && \
Expand Down
2 changes: 1 addition & 1 deletion infra/base-images/base-builder-swift/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
#
################################################################################

FROM gcr.io/oss-fuzz-base/base-builder-new
FROM gcr.io/oss-fuzz-base/base-builder-new:xenial

RUN install_swift.sh

1 comment on commit 291a152

@jonathanmetzman
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CC @oliverchang @inferno-chromium
Sorry, didn't mean to push this to master, meant to do a PR.

Please sign in to comment.