From bc4d498d9737f64efd981b0b45cc95c0eb1a56b5 Mon Sep 17 00:00:00 2001 From: Lizan Zhou Date: Thu, 15 Oct 2020 12:49:31 -0700 Subject: [PATCH 1/2] ci: stop building alpine-debug images in favor of ubuntu-based debug image Signed-off-by: Lizan Zhou --- .azure-pipelines/pipelines.yml | 9 +++++++++ ci/README.md | 6 +++--- ci/docker_ci.sh | 2 +- docs/root/start/building.rst | 6 ------ 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.azure-pipelines/pipelines.yml b/.azure-pipelines/pipelines.yml index 151736a8f335e..4efd687e546c6 100644 --- a/.azure-pipelines/pipelines.yml +++ b/.azure-pipelines/pipelines.yml @@ -250,6 +250,10 @@ stages: steps: - bash: .azure-pipelines/cleanup.sh displayName: "Removing tools from agent" + - bash: | + echo "disk space at beginning of build:" + df -h + displayName: "Check disk space at beginning" - task: DownloadBuildArtifacts@0 inputs: buildType: current @@ -275,6 +279,11 @@ stages: AZP_SHA1: $(Build.SourceVersion) DOCKERHUB_USERNAME: $(DockerUsername) DOCKERHUB_PASSWORD: $(DockerPassword) + - bash: | + echo "disk space at end of build:" + df -h + displayName: "Check disk space at end" + condition: always() - task: PublishBuildArtifacts@1 inputs: pathtoPublish: "$(Build.StagingDirectory)/build_images" diff --git a/ci/README.md b/ci/README.md index 54dbaef534fe5..5a0fe38e6a8f7 100644 --- a/ci/README.md +++ b/ci/README.md @@ -15,9 +15,9 @@ binary built from the latest tip of master that passed tests. ## Alpine Envoy image -Minimal images based on Alpine Linux allow for quicker deployment of Envoy. Two Alpine based images are built, -one with an Envoy binary with debug (`envoyproxy/envoy-alpine-debug`) symbols and one stripped of them (`envoyproxy/envoy-alpine`). -Both images are pushed with two different tags: `` and `latest`. Parallel to the Ubuntu images above, `` corresponds to the +Minimal images based on Alpine Linux allow for quicker deployment of Envoy. The Alpine base image are only built with symbol stripped. +To get the binary with symbols, use the corresponding Ubuntu based debug image. The image is pushed with two different tags: +`` and `latest`. Parallel to the Ubuntu images above, `` corresponds to the master commit at which the binary was compiled, and `latest` corresponds to a binary built from the latest tip of master that passed tests. ## Windows 2019 Envoy image diff --git a/ci/docker_ci.sh b/ci/docker_ci.sh index cafe0ee3ca867..3bd584923bdf9 100755 --- a/ci/docker_ci.sh +++ b/ci/docker_ci.sh @@ -125,7 +125,7 @@ if is_windows; then BUILD_COMMAND=("build") else # "-google-vrp" must come afer "" to ensure we rebuild the local base image dependency. - BUILD_TYPES=("" "-debug" "-alpine" "-alpine-debug" "-google-vrp") + BUILD_TYPES=("" "-debug" "-alpine" "-google-vrp") # Configure docker-buildx tools BUILD_COMMAND=("buildx" "build") diff --git a/docs/root/start/building.rst b/docs/root/start/building.rst index 39f5e23273d35..102ff52903e5a 100644 --- a/docs/root/start/building.rst +++ b/docs/root/start/building.rst @@ -42,9 +42,6 @@ be found in the following repositories: binary with debug symbols on top of an Ubuntu Bionic base. * `envoyproxy/envoy-alpine `_: Release binary with symbols stripped on top of a **glibc** alpine base. -* `envoyproxy/envoy-alpine-debug `_: - *Deprecated in favor of envoyproxy/envoy-debug.* Release binary with debug symbols on top of a - Release binary with debug symbols on top of a **glibc** alpine base. .. note:: @@ -59,9 +56,6 @@ be found in the following repositories: binary with debug symbols on top of an Ubuntu Bionic base. * `envoyproxy/envoy-alpine-dev `_: Release binary with symbols stripped on top of a **glibc** alpine base. -* `envoyproxy/envoy-alpine-debug-dev `_: - *Deprecated in favor of envoyproxy/envoy-debug-dev.* Release binary with debug symbols on top of a - **glibc** alpine base. In the above *dev* repositories, the *latest* tag points to the last Envoy SHA in master that passed tests. From 0f45b0205eca5ca969cd068242b242f0cf357615 Mon Sep 17 00:00:00 2001 From: Lizan Zhou Date: Thu, 15 Oct 2020 15:00:41 -0700 Subject: [PATCH 2/2] fix and release notes Signed-off-by: Lizan Zhou --- ci/README.md | 2 +- docs/root/version_history/current.rst | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/README.md b/ci/README.md index 5a0fe38e6a8f7..ccef23fb5bf2e 100644 --- a/ci/README.md +++ b/ci/README.md @@ -15,7 +15,7 @@ binary built from the latest tip of master that passed tests. ## Alpine Envoy image -Minimal images based on Alpine Linux allow for quicker deployment of Envoy. The Alpine base image are only built with symbol stripped. +Minimal images based on Alpine Linux allow for quicker deployment of Envoy. The Alpine base image is only built with symbols stripped. To get the binary with symbols, use the corresponding Ubuntu based debug image. The image is pushed with two different tags: `` and `latest`. Parallel to the Ubuntu images above, `` corresponds to the master commit at which the binary was compiled, and `latest` corresponds to a binary built from the latest tip of master that passed tests. diff --git a/docs/root/version_history/current.rst b/docs/root/version_history/current.rst index 830432731df93..74060d4e5c5fb 100644 --- a/docs/root/version_history/current.rst +++ b/docs/root/version_history/current.rst @@ -9,6 +9,7 @@ Minor Behavior Changes ---------------------- *Changes that may cause incompatibilities for some users, but should not for most* +* build: the Alpine based debug images are no longer built in CI, use Ubuntu based images instead. * ext_authz filter: the deprecated field :ref:`use_alpha ` is no longer supported and cannot be set anymore. Bug Fixes