diff --git a/docker-compose.yml b/docker-compose.yml index 3bf07ed34bdf..ed9089b61d17 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -96,6 +96,11 @@ services: crashpad-symbolize: build: + args: + - GITHUB_TAG=${GITHUB_TAG:-23.lts.5} + - ARCHITECTURE=${ARCHITECTURE:-x64} + - SB_API_VERSION=${SB_API_VERSION:-14} + - CONFIG=${CONFIG:-qa} context: ./docker/crashpad_symbolize dockerfile: Dockerfile image: crashpad-symbolize diff --git a/docker/crashpad_symbolize/Dockerfile b/docker/crashpad_symbolize/Dockerfile index 444205306e25..4284a11903df 100644 --- a/docker/crashpad_symbolize/Dockerfile +++ b/docker/crashpad_symbolize/Dockerfile @@ -1,11 +1,8 @@ FROM cobalt-base RUN apt update -qqy \ - && apt install -qqy --no-install-recommends jq build-essential \ - && apt-get clean autoclean \ - && apt-get autoremove -y --purge \ - && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \ - && rm -rf /var/lib/{apt,dpkg,cache,log} + && apt install -qqy --no-install-recommends jq build-essential zlib1g-dev libzstd-dev \ + && /opt/clean-after-apt.sh RUN cd /tmp \ && git clone 'https://chromium.googlesource.com/chromium/tools/depot_tools.git' @@ -30,7 +27,7 @@ ARG ARCHITECTURE ARG SB_API_VERSION ARG CONFIG ENV CONTAINS_STRING unstripped_${ARCHITECTURE}_sbversion-${SB_API_VERSION}_${CONFIG} -RUN jq -r '.assets[] | select(.name | contains($CONTAINS_STRING)) | .id' /tmp/release.json > /tmp/asset_id.txt \ +RUN jq -r --arg str "$CONTAINS_STRING" '.assets[] | select(.name | contains($str)) | .id' /tmp/release.json > /tmp/asset_ids.txt \ && rm /tmp/release.json RUN while read asset_id; do \ @@ -38,20 +35,20 @@ RUN while read asset_id; do \ -H "Accept: application/vnd.github+json" \ -H "X-GitHub-Api-Version: 2022-11-28" \ https://api.github.com/repos/youtube/cobalt/releases/assets/${asset_id}; \ - done < asset_ids.txt \ - && rm /tmp/asset_ids.txt + done < /tmp/asset_ids.txt -RUN id=$(cat asset_ids.txt) && \ +RUN id=$(cat /tmp/asset_ids.txt) && \ + rm /tmp/asset_ids.txt && \ curl -s -L \ - -H "Accept: application/vnd.github.v3+json" \ + -H "Accept: application/octet-stream" \ -H "X-GitHub-Api-Version: 2022-11-28" \ - https://api.github.com/repos/$owner/$repo/releases/assets/$id -o /tmp/libcobalt.tgz + https://api.github.com/repos/youtube/cobalt/releases/assets/$id -o /tmp/libcobalt.tgz RUN tar xzf /tmp/libcobalt.tgz -RUN libcobalt_path=$(find /tmp/tmp/cobalt-evergreen-snapshot/ -name "libcobalt.so") \ - && /tmp/src/tools/linux/dump_syms/dump_syms $libcobalt_path > /tmp/libcobalt.so.sym \ +RUN libcobalt_path=$(find /tmp/cobalt-evergreen-snapshot/ -name "libcobalt.so") \ + && breakpad/src/src/tools/linux/dump_syms/dump_syms $libcobalt_path > /tmp/libcobalt.so.sym \ && debug_id=$(head -n1 /tmp/libcobalt.so.sym | cut -d' ' -f4) \ && mkdir -p /tmp/symbols/libcobalt.so/$debug_id/ \ && mv /tmp/libcobalt.so.sym /tmp/symbols/libcobalt.so/$debug_id/ -CMD /tmp/src/processor/minidump_stackwalk ${MINIDUMP_PATH} /tmp/symbols +CMD breakpad/src/src/processor/minidump_stackwalk ${MINIDUMP_PATH} /tmp/symbols