build: use 20.04 based image (envoyproxy#21388)

Signed-off-by: Lizan Zhou <lizan@tetrate.io>
LeonGao91 · Aug 2, 2022 · 1647d36 · 1647d36
1 parent 1b5540f
commit 1647d36
Show file tree

Hide file tree

Showing 13 changed files with 49 additions and 43 deletions.
diff --git a/.azure-pipelines/pipelines.yml b/.azure-pipelines/pipelines.yml
@@ -16,7 +16,7 @@ stages:
   - job: format
     dependsOn: []
     pool:
-      vmImage: "ubuntu-18.04"
+      vmImage: "ubuntu-20.04"
     steps:
     - task: Cache@2
       inputs:
@@ -46,7 +46,7 @@ stages:
   - job: proto_format
     dependsOn: []
     pool:
-      vmImage: "ubuntu-18.04"
+      vmImage: "ubuntu-20.04"
     steps:
     - task: Cache@2
       inputs:
@@ -76,7 +76,7 @@ stages:
     dependsOn: []  # this removes the implicit dependency on previous stage and causes this to run in parallel.
     condition: ne(variables['PostSubmit'], true)
     pool:
-      vmImage: "ubuntu-18.04"
+      vmImage: "ubuntu-20.04"
     steps:
     - task: Cache@2
       inputs:
@@ -107,7 +107,7 @@ stages:
   - job: dependencies
     dependsOn: []  # this removes the implicit dependency on previous stage and causes this to run in parallel.
     pool:
-      vmImage: "ubuntu-18.04"
+      vmImage: "ubuntu-20.04"
     steps:
     - task: Cache@2
       inputs:
@@ -134,7 +134,7 @@ stages:
   - job: filter_example
     dependsOn: []
     pool:
-      vmImage: "ubuntu-18.04"
+      vmImage: "ubuntu-20.04"
     steps:
     - task: InstallSSHKey@0
       inputs:
@@ -152,7 +152,7 @@ stages:
   - job: data_plane_api
     dependsOn: []
     pool:
-      vmImage: "ubuntu-18.04"
+      vmImage: "ubuntu-20.04"
     steps:
     - task: InstallSSHKey@0
       inputs:
@@ -170,7 +170,7 @@ stages:
   - job: go_control_plane
     dependsOn: []
     pool:
-      vmImage: "ubuntu-18.04"
+      vmImage: "ubuntu-20.04"
     steps:
     - task: InstallSSHKey@0
       inputs:
@@ -199,7 +199,7 @@ stages:
   - job: release
     timeoutInMinutes: 120
     pool:
-      vmImage: "ubuntu-18.04"
+      vmImage: "ubuntu-20.04"
     steps:
     - template: bazel.yml
       parameters:
@@ -229,7 +229,7 @@ stages:
     dependsOn: []
     timeoutInMinutes: 120
     pool:
-      vmImage: "ubuntu-18.04"
+      vmImage: "ubuntu-20.04"
     steps:
     - template: bazel.yml
       parameters:
@@ -250,7 +250,7 @@ stages:
     dependsOn: ["package_x64"]
     timeoutInMinutes: 120
     pool:
-      vmImage: "ubuntu-18.04"
+      vmImage: "ubuntu-20.04"
     steps:
     - task: DownloadBuildArtifacts@0
       inputs:
@@ -318,7 +318,7 @@ stages:
           CI_TARGET: "bazel.compile_time_options"
     timeoutInMinutes: 120
     pool:
-      vmImage: "ubuntu-18.04"
+      vmImage: "ubuntu-20.04"
     steps:
     - template: bazel.yml
       parameters:
@@ -360,7 +360,7 @@ stages:
     displayName: "linux multiarch"
     timeoutInMinutes: 120
     pool:
-      vmImage: "ubuntu-18.04"
+      vmImage: "ubuntu-20.04"
     steps:
     - bash: |
         echo "disk space at beginning of build:"
@@ -431,7 +431,7 @@ stages:
   jobs:
   - job: publish
     pool:
-      vmImage: "ubuntu-18.04"
+      vmImage: "ubuntu-20.04"
     steps:
     - task: Cache@2
       inputs:
@@ -479,7 +479,7 @@ stages:
   jobs:
   - job: examples
     pool:
-      vmImage: "ubuntu-18.04"
+      vmImage: "ubuntu-20.04"
     steps:
     - task: DownloadBuildArtifacts@0
       inputs:

diff --git a/.bazelrc b/.bazelrc
@@ -288,7 +288,7 @@ build:remote-clang-cl --config=rbe-toolchain-clang-cl
 
 # Docker sandbox
 # NOTE: Update this from https://github.com/envoyproxy/envoy-build-tools/blob/main/toolchains/rbe_toolchains_config.bzl#L8
-build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:0a02a76af5951bf7f4c7029c0ea6d29d96c0f682
+build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:3de483a98c5e24973e710b4f97b2dabcd3cb621f
 build:docker-sandbox --spawn_strategy=docker
 build:docker-sandbox --strategy=Javac=docker
 build:docker-sandbox --strategy=Closure=docker

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM gcr.io/envoy-ci/envoy-build:0a02a76af5951bf7f4c7029c0ea6d29d96c0f682
+FROM gcr.io/envoy-ci/envoy-build:3de483a98c5e24973e710b4f97b2dabcd3cb621f
 
 ARG USERNAME=vscode
 ARG USER_UID=501

diff --git a/bazel/foreign_cc/BUILD b/bazel/foreign_cc/BUILD
@@ -116,6 +116,10 @@ configure_make(
 
 configure_make(
     name = "ragel",
+    configure_options = [
+        "AUTOMAKE=automake",
+        "ACLOCAL=aclocal",
+    ],
     # Workaround for the issue with statically linked libstdc++
     # using -l:libstdc++.a.
     env = {

diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
@@ -80,11 +80,11 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         project_name = "envoy-build-tools",
         project_desc = "Common build tools shared by the Envoy/UDPA ecosystem",
         project_url = "https://github.com/envoyproxy/envoy-build-tools",
-        version = "9cdf86f3fe383c7f894d1814da3f0bc5bec8c8c4",
-        sha256 = "88e76fdd6b2ee52e66b6b5933eb25e4263285c8b6133b330699c8796c28da606",
+        version = "08c1f7edd91d5c891e8b94e87f0eafa6b4224fad",
+        sha256 = "2b12185033fb9178dfaba24412004f89f36263dec1f06c039d9e718e5533d500",
         strip_prefix = "envoy-build-tools-{version}",
         urls = ["https://github.com/envoyproxy/envoy-build-tools/archive/{version}.tar.gz"],
-        release_date = "2022-05-12",
+        release_date = "2022-05-18",
         use_category = ["build"],
     ),
     boringssl = dict(

diff --git a/changelogs/current.yaml b/changelogs/current.yaml
@@ -2,6 +2,9 @@ date: Pending
 
 behavior_changes:
 # *Changes that are expected to cause an incompatibility if applicable; deployment changes are likely required*
+- area: build
+  change: |
+    official released binary is now built on Ubuntu 20.04, requires glibc >= 2.30.
 - area: http
   change: |
     Envoy no longer adds ``content-length: 0`` header when proxying UPGRADE requests without ``content-length`` and ``transfer-encoding`` headers.
@@ -56,6 +59,9 @@ new_features:
 - area: gzip
   change: |
     added support for :ref:`max_inflate_ratio<envoy_v3_api_msg_extensions.compression.gzip.decompressor.v3.Gzip>`.
+- area: build
+  change: |
+    official released binary is now built on Ubuntu 20.04, requires glibc >= 2.30.
 - area: listener
   change: |
     added multiple listening addresses in single listener. :ref:`listener additional addresses<envoy_v3_api_field_config.listener.v3.Listener.additional_addresses>`.

diff --git a/ci/Dockerfile-envoy b/ci/Dockerfile-envoy
@@ -1,5 +1,5 @@
 ARG BUILD_OS=ubuntu
-ARG BUILD_TAG=18.04
+ARG BUILD_TAG=20.04
 ARG ENVOY_VRP_BASE_IMAGE=envoy
 
 

diff --git a/ci/README.md b/ci/README.md
@@ -32,7 +32,7 @@ running tests that reflects the latest built Windows 2019 Envoy image.
 Currently there are three build images for Linux and one for Windows:
 
 * `envoyproxy/envoy-build` &mdash; alias to `envoyproxy/envoy-build-ubuntu`.
-* `envoyproxy/envoy-build-ubuntu` &mdash; based on Ubuntu 18.04 (Bionic) with GCC 9 and Clang 14 compiler.
+* `envoyproxy/envoy-build-ubuntu` &mdash; based on Ubuntu 20.04 (Focal) with GCC 9 and Clang 14 compiler.
 * `envoyproxy/envoy-build-centos` &mdash; based on CentOS 7 with GCC 9 and Clang 14 compiler, this image is experimental and not well tested.
 * `envoyproxy/envoy-build-windows2019` &mdash; based on Windows ltsc2019 with VS 2019 Build Tools, as well as LLVM.
 

diff --git a/distribution/debian/packages.bzl b/distribution/debian/packages.bzl
@@ -10,7 +10,7 @@ def envoy_pkg_deb(
         description = "Envoy built for Debian/Ubuntu",
         preinst = "//distribution/debian:preinst",
         postinst = "//distribution/debian:postinst",
-        supported_distributions = "buster bullseye bionic focal",
+        supported_distributions = "bullseye focal jammy",
         architecture = select({
             "//bazel:x86": "amd64",
             "//conditions:default": "arm64",

diff --git a/distribution/distros.yaml b/distribution/distros.yaml
@@ -1,16 +1,12 @@
 
-debian_buster:
-  image: debian:buster-slim
-  ext: buster.changes
-
 debian_bullseye:
   image: debian:bullseye-slim
   ext: bullseye.changes
 
-ubuntu_bionic:
-  image: ubuntu:18.04
-  ext: bionic.changes
-
 ubuntu_focal:
   image: ubuntu:20.04
   ext: focal.changes
+
+ubuntu_jammy:
+  image: ubuntu:22.04
+  ext: jammy.changes
diff --git a/docs/root/start/building.rst b/docs/root/start/building.rst
@@ -17,7 +17,7 @@ Linux/Mac Target Requirements
 -----------------------------
 
 Envoy was initially developed and deployed on Ubuntu 14.04 LTS. It should work on any reasonably
-recent Linux including Ubuntu 18.04 LTS.
+recent Linux including Ubuntu 20.04 LTS.
 
 Building Envoy has the following requirements:
 

diff --git a/docs/root/start/install.rst b/docs/root/start/install.rst
@@ -160,13 +160,13 @@ The following table shows the available Docker images
      - amd64
      - arm64
    * - `envoyproxy/envoy <https://hub.docker.com/r/envoyproxy/envoy/tags/>`_
-     - Release binary with symbols stripped on top of an Ubuntu Bionic base.
+     - Release binary with symbols stripped on top of an Ubuntu 20.04 base.
      - |DOCKER_IMAGE_TAG_NAME|
      - |DOCKER_IMAGE_TAG_NAME|
      -
      -
    * - `envoyproxy/envoy-contrib <https://hub.docker.com/r/envoyproxy/envoy-contrib/tags/>`_
-     - Release :ref:`contrib <install_contrib>` binary with symbols stripped on top of an Ubuntu Bionic base.
+     - Release :ref:`contrib <install_contrib>` binary with symbols stripped on top of an Ubuntu 20.04 base.
      - |DOCKER_IMAGE_TAG_NAME|
      - |DOCKER_IMAGE_TAG_NAME|
      -
@@ -184,31 +184,31 @@ The following table shows the available Docker images
      -
      -
    * - `envoyproxy/envoy-debug <https://hub.docker.com/r/envoyproxy/envoy-debug/tags/>`_
-     - Release binary with debug symbols on top of an Ubuntu Bionic base.
+     - Release binary with debug symbols on top of an Ubuntu 20.04 base.
      - |DOCKER_IMAGE_TAG_NAME|
      - |DOCKER_IMAGE_TAG_NAME|
      -
      -
    * - `envoyproxy/envoy-contrib-debug <https://hub.docker.com/r/envoyproxy/envoy-contrib-debug/tags/>`_
-     - Release :ref:`contrib <install_contrib>` binary with debug symbols on top of an Ubuntu Bionic base.
+     - Release :ref:`contrib <install_contrib>` binary with debug symbols on top of an Ubuntu 20.04 base.
      - |DOCKER_IMAGE_TAG_NAME|
      - |DOCKER_IMAGE_TAG_NAME|
      -
      -
    * - `envoyproxy/envoy-tools <https://hub.docker.com/r/envoyproxy/envoy-tools/tags/>`_
-     - Release :ref:`tools <install_tools>` on top of an Ubuntu Bionic base.
+     - Release :ref:`tools <install_tools>` on top of an Ubuntu 20.04 base.
      - |DOCKER_IMAGE_TAG_NAME|
      - |DOCKER_IMAGE_TAG_NAME|
      -
      -
    * - `envoyproxy/envoy-dev <https://hub.docker.com/r/envoyproxy/envoy-dev/tags/>`_
-     - Release binary with symbols stripped on top of an Ubuntu Bionic base.
+     - Release binary with symbols stripped on top of an Ubuntu 20.04 base.
      -
      -
      - latest
      - latest
    * - `envoyproxy/envoy-contrib-dev <https://hub.docker.com/r/envoyproxy/envoy-contrib-dev/tags/>`_
-     - Release :ref:`contrib <install_contrib>` binary with symbols stripped on top of an Ubuntu Bionic base.
+     - Release :ref:`contrib <install_contrib>` binary with symbols stripped on top of an Ubuntu 20.04 base.
      -
      -
      - latest
@@ -220,13 +220,13 @@ The following table shows the available Docker images
      - latest
      - latest
    * - `envoyproxy/envoy-debug-dev <https://hub.docker.com/r/envoyproxy/envoy-debug-dev/tags/>`_
-     - Release binary with debug symbols on top of an Ubuntu Bionic base.
+     - Release binary with debug symbols on top of an Ubuntu 20.04 base.
      -
      -
      - latest
      - latest
    * - `envoyproxy/envoy-contrib-debug-dev <https://hub.docker.com/r/envoyproxy/envoy-contrib-debug-dev/tags/>`_
-     - Release :ref:`contrib <install_contrib>` binary with debug symbols on top of an Ubuntu Bionic base.
+     - Release :ref:`contrib <install_contrib>` binary with debug symbols on top of an Ubuntu 20.04 base.
      -
      -
      - latest
@@ -238,7 +238,7 @@ The following table shows the available Docker images
      - latest
      -
    * - `envoyproxy/envoy-tools-dev <https://hub.docker.com/r/envoyproxy/envoy-tools-dev/tags/>`_
-     - Release :ref:`tools <install_tools>` on top of an Ubuntu Bionic base.
+     - Release :ref:`tools <install_tools>` on top of an Ubuntu 20.04 base.
      -
      -
      - latest

diff --git a/examples/wasm-cc/docker-compose-wasm.yaml b/examples/wasm-cc/docker-compose-wasm.yaml
@@ -2,7 +2,7 @@ version: "3.8"
 
 services:
   wasm_compile_update:
-    image: envoyproxy/envoy-build-ubuntu:0a02a76af5951bf7f4c7029c0ea6d29d96c0f682
+    image: envoyproxy/envoy-build-ubuntu:3de483a98c5e24973e710b4f97b2dabcd3cb621f
     command: |
       bash -c "bazel build //examples/wasm-cc:envoy_filter_http_wasm_updated_example.wasm && cp -a bazel-bin/examples/wasm-cc/* /build"
     working_dir: /source
@@ -11,7 +11,7 @@ services:
     - ./lib:/build
 
   wasm_compile:
-    image: envoyproxy/envoy-build-ubuntu:0a02a76af5951bf7f4c7029c0ea6d29d96c0f682
+    image: envoyproxy/envoy-build-ubuntu:3de483a98c5e24973e710b4f97b2dabcd3cb621f
     command: |
       bash -c "bazel build //examples/wasm-cc:envoy_filter_http_wasm_example.wasm && cp -a bazel-bin/examples/wasm-cc/* /build"
     working_dir: /source