fix

Signed-off-by: Ryan Northey <[email protected]>

Author: phlax

.github/config.yml

@@ -7,76 +7,86 @@
 debian:
   ci:
     paths:
-    - docker/linux/debian/**
+    - docker/linux/debian/*
     - docker/linux/debian_build.sh
     - docker/push.sh
     - docker/linux/build.sh
     - docker/linux/common_fun.sh
     - docker/linux/group_manifests.sh
-    - .github/workflows/**
+    - .github/**/*
   manifests:
+  # devtools
   - name: envoy-build
     tag: devtools-{sha}
     registry: docker.io/envoyproxy
     architectures:
     - amd64
     - arm64
     artifact-pattern: oci-debian-{arch}/debian-devtools-{sha}-{arch}.tar
+  # ci
   - name: envoy-build
     tag: ci-{sha}
     registry: docker.io/envoyproxy
     architectures:
     - amd64
     - arm64
     artifact-pattern: oci-debian-{arch}/debian-ci-{sha}-{arch}.tar
+  # worker
   - name: envoy-build
     tag: worker-{sha}
     registry: docker.io/envoyproxy
     architectures:
     - amd64
     - arm64
     artifact-pattern: oci-debian-{arch}/debian-worker-{sha}-{arch}.tar
+  # worker (gcr)
   - name: envoy-build
     tag: worker-{sha}
     registry: gcr.io/envoy-ci
     architectures:
     - amd64
     - arm64
     artifact-pattern: oci-debian-{arch}/debian-worker-{sha}-{arch}.tar
+  # gcc
   - name: envoy-build
     tag: gcc-{sha}
     registry: docker.io/envoyproxy
     architectures:
     - amd64
     - arm64
     artifact-pattern: oci-debian-{arch}/debian-gcc-{sha}-{arch}.tar
+  # gcc (gcr)
   - name: envoy-build
     tag: gcc-{sha}
     registry: gcr.io/envoy-ci
     architectures:
     - amd64
     - arm64
     artifact-pattern: oci-debian-{arch}/debian-gcc-{sha}-{arch}.tar
+  # docker
   - name: envoy-build
     tag: docker-{sha}
     registry: docker.io/envoyproxy
     architectures:
     - amd64
     - arm64
     artifact-pattern: oci-debian-{arch}/debian-docker-{sha}-{arch}.tar
+  # test
   - name: envoy-build
     tag: test-{sha}
     registry: docker.io/envoyproxy
     architectures:
     - amd64
     - arm64
     artifact-pattern: oci-debian-{arch}/debian-test-{sha}-{arch}.tar
+  # llvm
   - name: envoy-build
     tag: llvm-{sha}
     registry: docker.io/envoyproxy
     architectures:
     - amd64
     artifact-pattern: oci-debian-{arch}/debian-llvm-{sha}-{arch}.tar
+  # mobile
   - name: envoy-build
     tag: mobile-{sha}
     registry: docker.io/envoyproxy
@@ -87,41 +97,46 @@ debian:
 ubuntu:
   ci:
     paths:
-    - docker/linux/ubuntu/**
+    - docker/linux/ubuntu/*
     - docker/push.sh
     - docker/linux/build.sh
     - docker/linux/common_fun.sh
     - docker/linux/group_manifests.sh
-    - .github/workflows/**
+    - .github/**/*
   manifests:
+  # ci
   - name: envoy-build-ubuntu
     tag: ci-{sha}
     registry: docker.io/envoyproxy
     architectures:
     - arm64
     - amd64
     artifact-pattern: oci-ubuntu-{arch}/ubuntu-ci-{sha}-{arch}.tar
+  # mobile
   - name: envoy-build-ubuntu
     tag: mobile-{sha}
     registry: docker.io/envoyproxy
     architectures:
     - amd64
     artifact-pattern: oci-ubuntu-{arch}/ubuntu-mobile-{sha}-{arch}.tar
+  # test
   - name: envoy-build-ubuntu
     tag: test-{sha}
     registry: docker.io/envoyproxy
     architectures:
     - amd64
     artifact-pattern: oci-ubuntu-{arch}/ubuntu-test-{sha}-{arch}.tar
+  # full
   - name: envoy-build-ubuntu
-    tag: full-f8d1fd9bdac3a7843d1e69816456648989d238be
+    tag: full-{sha}
     registry: docker.io/envoyproxy
     architectures:
     - amd64
     - arm64
     artifact-pattern: oci-ubuntu-{arch}/ubuntu-full-{sha}-{arch}.tar
     additional-tags:
     - "{sha}"
+  # full (gcr)
   - name: envoy-build
     tag: "{sha}"
     registry: gcr.io/envoy-ci

docker/linux/build.sh

@@ -2,15 +2,13 @@
 
 set -o pipefail
 
-# Ubuntu-specific build configuration
 UBUNTU_DOCKER_VARIANTS=("ci" "mobile" "test")
 IMAGE_TAGS=${IMAGE_TAGS:-}
 
 
 [[ -z "${OS_DISTRO}" ]] && OS_DISTRO="ubuntu"
 [[ -z "${IMAGE_NAME}" ]] && IMAGE_NAME="envoyproxy/envoy-build-${OS_DISTRO}"
 
-# Ubuntu uses multi-arch builds by default
 if [[ -z "${BUILD_TOOLS_PLATFORMS}" ]]; then
     if [[ "${OS_DISTRO}" == "ubuntu" ]]; then
         export BUILD_TOOLS_PLATFORMS=linux/arm64,linux/amd64
@@ -46,7 +44,6 @@ config_env() {
     docker buildx create --use --name envoy-build-tools-builder --platform "${BUILD_TOOLS_PLATFORMS}"
 }
 
-# Build Ubuntu variants with specific platform logic
 # TODO(phlax): add (json) build images config
 build_and_push_variants () {
     if [[ "${OS_DISTRO}" != "ubuntu" ]]; then
@@ -83,7 +80,6 @@ build_and_push_variants () {
 
 ci_log_run config_env
 
-# Default target for Ubuntu is 'full' (complete build environment)
 # Build the full/main image first
 if [[ "${SAVE_OCI}" == "true" ]]; then
     echo "Building OCI artifact to: ${OCI_OUTPUT_DIR}/${OS_DISTRO}-full-${CONTAINER_TAG}${ARCH_SUFFIX}.tar"