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

Jump to bottom

current envoy fips builds need ncurses 6 #2700

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+7 −7
Open

current envoy fips builds need ncurses 6 #2700

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a81295
update to ubuntu focal to allow for building newer envoy with fips
ceastman-r7 Oct 12, 2023
b27b806
Merge branch 'istio:master' into master
ceastman-r7 Oct 12, 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
14 changes: 7 additions & 7 deletions docker/build-tools/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,8 +687,8 @@ ENTRYPOINT ["/usr/local/bin/docker-entrypoint"]
# Clang+LLVM
##############

FROM ubuntu:18.04 AS clang_context_amd64
ENV UBUNTU_RELEASE_CODE_NAME=bionic
FROM ubuntu:20.04 AS clang_context_amd64
ENV UBUNTU_RELEASE_CODE_NAME=focal
FROM ubuntu:20.04 AS clang_context_arm64
ENV UBUNTU_RELEASE_CODE_NAME=focal
# hadolint ignore=DL3006
Expand Down Expand Up @@ -782,8 +782,8 @@ RUN set -eux; \
# Bazel
###########

FROM ubuntu:xenial AS bazel_context_amd64
FROM ubuntu:bionic AS bazel_context_arm64
FROM ubuntu:focal AS bazel_context_amd64
FROM ubuntu:focal AS bazel_context_arm64
# hadolint ignore=DL3006
FROM bazel_context_${TARGETARCH} AS bazel_context

Expand All @@ -807,9 +807,9 @@ RUN mv ${BAZELISK_BIN} /usr/local/bin/bazel
# Final image for proxy
########################

FROM ubuntu:18.04 AS build_env_proxy_amd64
ENV UBUNTU_RELEASE_CODE_NAME=bionic
ENV UBUNTU_RELEASE_VERSION=18.04
FROM ubuntu:20.04 AS build_env_proxy_amd64
ENV UBUNTU_RELEASE_CODE_NAME=focal
ENV UBUNTU_RELEASE_VERSION=20.04
FROM ubuntu:20.04 AS build_env_proxy_arm64
ENV UBUNTU_RELEASE_CODE_NAME=focal
ENV UBUNTU_RELEASE_VERSION=20.04
Expand Down