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.

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

docker/linux: Remove cmake image (used for Envoy 1.26) #336

Merged
merged 1 commit into from
Apr 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions .github/workflows/_regenerate_toolchain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,3 @@ jobs:
GCR_IMAGE_NAME: ${{ inputs.gcr_name }}
OS_FAMILY: ${{ inputs.os_family }}
SOURCE_BRANCH: ${{ github.ref }}
# TODO(phlax): remove when 1.26 goes EOL
CONTAINER_PREFIX: "${{ inputs.distro == 'ubuntu' && 'cmake-' || '' }}"
4 changes: 2 additions & 2 deletions docker/linux/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -o pipefail

UBUNTU_DOCKER_VARIANTS=("ci" "mobile" "cmake" "test")
UBUNTU_DOCKER_VARIANTS=("ci" "mobile" "test")
IMAGE_TAGS=${IMAGE_TAGS:-}


Expand Down Expand Up @@ -43,7 +43,7 @@ build_and_push_variants () {
push_arg+=(--push)
fi

if [[ "$variant" == "test" || "$variant" == "cmake" || "$variant" == "ci" ]]; then
if [[ "$variant" == "test" || "$variant" == "ci" ]]; then
platform="linux/amd64,linux/arm64"
else
# Only build variants for linux/amd64
Expand Down
10 changes: 0 additions & 10 deletions docker/linux/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -75,16 +75,6 @@ COPY \
/usr/local/bin


# cmake/legacy (for 1.26 branch)
FROM full as cmake
RUN --mount=type=tmpfs,target=/var/cache/apt \
--mount=type=tmpfs,target=/var/lib/apt/lists \
curl -fsSL https://apt.kitware.com/keys/kitware-archive-latest.asc | apt-key add - \
&& echo "deb https://apt.kitware.com/ubuntu/ focal main" >> /etc/apt/sources.list \
&& apt-get -qq update -y \
&& apt-get -qq install --no-install-recommends cmake ninja-build


# mobile
FROM full as mobile
ENV ANDROID_HOME=/.android/sdk \
Expand Down
4 changes: 0 additions & 4 deletions docker/push.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,6 @@ if [[ "${SOURCE_BRANCH}" == "refs/heads/main" ]]; then
if [[ "${PUSH_GCR_IMAGE}" == "true" ]]; then
echo ${GCP_SERVICE_ACCOUNT_KEY} | base64 --decode | gcloud auth activate-service-account --key-file=-
gcloud auth configure-docker --quiet
# TODO(phlax): remove this once 1.26 branch is EOL
if [[ "${OS_DISTRO}" == "ubuntu" ]]; then
TAG_SUFFIX="|cmake"
fi
IMAGE_TAGS+=("${GCR_IMAGE_PREFIX}${GCR_IMAGE_NAME}:${CONTAINER_SHA}${TAG_SUFFIX}")
fi
ci_log_run_end
Expand Down