Skip to content
This repository has been archived by the owner on Dec 20, 2019. It is now read-only.

Use new dump_syms #2

Merged
merged 15 commits into from
Nov 12, 2019
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
38 changes: 19 additions & 19 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
FROM ubuntu:16.04
# If host is running squid-deb-proxy on port 8000, populate /etc/apt/apt.conf.d/30proxy
# By default, squid-deb-proxy 403s unknown sources, so apt shouldn't proxy ppa.launchpad.net
RUN awk '/^[a-z]+[0-9]+\t00000000/ { printf("%d.%d.%d.%d\n", "0x" substr($3, 7, 2), "0x" substr($3, 5, 2), "0x" substr($3, 3, 2), "0x" substr($3, 1, 2)) }' < /proc/net/route > /tmp/host_ip.txt
RUN perl -pe 'use IO::Socket::INET; chomp; $socket = new IO::Socket::INET(PeerHost=>$_,PeerPort=>"8000"); print $socket "HEAD /\n\n"; my $data; $socket->recv($data,1024); exit($data !~ /squid-deb-proxy/)' < /tmp/host_ip.txt \
&& (echo "Acquire::http::Proxy \"http://$(cat /tmp/host_ip.txt):8000\";" > /etc/apt/apt.conf.d/30proxy) \
&& (echo "Acquire::http::Proxy::ppa.launchpad.net DIRECT;" >> /etc/apt/apt.conf.d/30proxy) \
|| echo "No squid-deb-proxy detected on docker host"
RUN dpkg --add-architecture i386 \
&& apt-get update \
&& apt-get install -y software-properties-common \
&& add-apt-repository ppa:pipelight/stable \
&& apt-get update \
&& apt-get install -y --install-recommends wine-staging cabextract wget python-dev build-essential git
RUN wget https://bootstrap.pypa.io/get-pip.py && python get-pip.py
RUN pip install --upgrade requests
FROM python:slim

RUN useradd -d /home/user -s /bin/bash -m user
WORKDIR /home/user
RUN mkdir dump_syms
ADD dump-syms.manifest /home/user/dump_syms/
ADD config.py.docker /home/user/config.py
ADD https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozbuild/mozbuild/action/tooltool.py /home/user/tooltool.py
ADD requirements.txt .

RUN apt-get update \
&& apt-get install -y --no-install-recommends wget git \
&& wget -qO- https://bootstrap.pypa.io/get-pip.py | python \
&& pip install --disable-pip-version-check --quiet --no-cache-dir -r requirements.txt \
&& wget -qO- https://github.com/mozilla/dump_syms/releases/latest/download/dump_syms-linux-x86_64.tar.gz | tar xvz -C dump_syms \
&& apt-get remove -y wget \
&& apt-get autoremove -y \
&& rm -rf /var/lib/apt/lists/* \
&& python -m pip uninstall pip -y

ENV DUMP_SYMS_PATH /home/user/dump_syms/dump_syms-linux-x86_64/dump_syms

# Uncomment next line and comment the next next for local test
#ADD . /home/user
ADD start.sh /home/user/

RUN chown -R user.user /home/user
USER user
2 changes: 0 additions & 2 deletions config.py.docker

This file was deleted.

7 changes: 0 additions & 7 deletions config.py.in

This file was deleted.

10 changes: 0 additions & 10 deletions dump-syms.manifest

This file was deleted.

3 changes: 3 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
aiofile==1.5.2
aiohttp==3.6.2
aiodns==2.0.0
marco-c marked this conversation as resolved.
Show resolved Hide resolved
11 changes: 0 additions & 11 deletions run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,5 @@ set -v -e -x

base="$(realpath $(dirname $0))"

cd /home/user/dump_syms
if test -n "$LOCAL"; then
EXTRA="--authentication-file=/home/user/luser/tooltool-download-token"
else
EXTRA="--url=http://taskcluster/tooltool.mozilla-releng.net/"
fi
python ../tooltool.py -v ${EXTRA} -m dump-syms.manifest fetch
/opt/wine-staging/bin/regsvr32 msdia120.dll

cd ..

mkdir -p artifacts
PYTHONPATH=$PWD python "${base}/symsrv-fetch.py" artifacts/target.crashreporter-symbols.zip
Empty file added skiplist.txt
Empty file.
Loading