|
36 | 36 | # Update base image |
37 | 37 | ARG UBUNTU_VERSION=22.04 |
38 | 38 | FROM ubuntu:${UBUNTU_VERSION} as build |
39 | | -RUN apt update && apt upgrade -y |
40 | | -RUN apt autoremove -y |
41 | 39 |
|
42 | | -# Install Bazel deps |
43 | | -RUN apt install -y software-properties-common |
44 | | -RUN add-apt-repository ppa:openjdk-r/ppa |
45 | | -RUN apt install -y \ |
46 | | - build-essential \ |
47 | | - openjdk-21-jdk \ |
48 | | - python3 \ |
49 | | - curl \ |
50 | | - zip \ |
51 | | - unzip |
| 40 | +# Consolidated system update/upgrade and autoremove |
| 41 | +RUN apt-get update && \ |
| 42 | + apt-get upgrade -y && \ |
| 43 | + apt-get autoremove -y && \ |
| 44 | + rm -rf /var/lib/apt/lists/* |
| 45 | + |
| 46 | + |
| 47 | +# Install all build dependencies (Bazel + ProxyWasm) |
| 48 | +ARG DEPS="build-essential clang curl git libssl-dev libstdc++6 openjdk-21-jdk python3 python3-distutils software-properties-common unzip zip libz-dev" |
| 49 | +RUN apt-get update && \ |
| 50 | + apt-get install -y --no-install-recommends $DEPS && \ |
| 51 | + add-apt-repository ppa:openjdk-r/ppa && \ |
| 52 | + rm -rf /var/lib/apt/lists/* |
| 53 | + |
| 54 | +# Set working directory for Bazel build |
| 55 | +WORKDIR /root/bazel |
52 | 56 |
|
53 | 57 | # Download Bazel source |
54 | 58 | ARG BAZEL_VERSION=7.7.1 |
55 | | -RUN cd ~ && mkdir bazel && cd bazel |
56 | | -RUN curl -LO https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-dist.zip |
57 | | -RUN unzip -q bazel-${BAZEL_VERSION}-dist.zip |
| 59 | +RUN curl -LO https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-dist.zip && \ |
| 60 | + unzip -q bazel-${BAZEL_VERSION}-dist.zip |
58 | 61 |
|
59 | | -# Build Bazel |
60 | | -# NOTE: This step is flaky and frequently hangs for multiarch / buildx. |
61 | | -# If it takes more than 2 hours, restart the Docker build and try again. |
| 62 | +## Build Bazel, copy the binary, then install ProxyWasm build deps |
| 63 | +# NOTE: This step is flaky and may hang for multiarch/buildx. |
| 64 | +# If it takes more than 2 hours, restart the Docker build. |
62 | 65 | ENV EXTRA_BAZEL_ARGS="--tool_java_runtime_version=local_jdk" |
63 | | -RUN bash ./compile.sh |
64 | | - |
65 | | -# Copy output to /usr/bin |
66 | | -RUN cp /output/bazel /usr/bin/bazel |
| 66 | +RUN bash ./compile.sh && \ |
| 67 | + cp /output/bazel /usr/bin/bazel && \ |
67 | 68 |
|
68 | | -# Install ProxyWasm build deps |
69 | | -RUN apt install -y \ |
70 | | - git \ |
71 | | - python3-distutils \ |
72 | | - clang \ |
73 | | - libstdc++6 \ |
74 | | - libssl-dev \ |
75 | | - libz-dev |
0 commit comments