This commit is contained in:
Bert van der Weerd 2022-02-05 00:38:22 +01:00
parent 2cd80ee2f2
commit 27d4a9dc0b
No known key found for this signature in database
GPG Key ID: 4CFABB96ADE0F5B1
2 changed files with 6 additions and 5 deletions

View File

@ -1,8 +1,9 @@
ARG version
ARG source_release
ARG distro
FROM $distro
ENV version 96.0.3
ENV source_release 3
# dependencies needed to run ./mach bootstrap
RUN ( apt-get -y update && apt-get -y upgrade && apt-get -y install mercurial python3 python3-dev python3-pip wget ; true)
RUN ( dnf -y upgrade && dnf -y install mercurial python3 python3-devel wget ; true)
@ -11,9 +12,9 @@ RUN ( dnf -y upgrade && dnf -y install mercurial python3 python3-devel wget ; tr
RUN mkdir /bootstrap
WORKDIR /bootstrap
# setup wasi
RUN ( export target_wasi_location=$HOME/.mozbuild/wrlb/ && wget -q https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-14/wasi-sdk-14.0-linux.tar.gz && tar xf wasi-sdk-14.0-linux.tar.gz && mkdir -p $target_wasi_location && rm -rf $target_wasi_location/wasi-sysroot && cp -vr wasi-sdk-14.0/share/wasi-sysroot $target_wasi_location && rm -f wasi-sdk-*.tar.gz* && rm -rf wasi-sdk-* )
RUN ( export target_wasi_location=$HOME/.mozbuild/wrlb/ && wget -q https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-14/wasi-sdk-14.0-linux.tar.gz && tar xf wasi-sdk-14.0-linux.tar.gz && mkdir -p $target_wasi_location && rm -rf $target_wasi_location/wasi-sysroot && cp -r wasi-sdk-14.0/share/wasi-sysroot $target_wasi_location && rm -f wasi-sdk-*.tar.gz* && rm -rf wasi-sdk-* )
# run the bootstrap
RUN ( wget -q -O librewolf-$version-$source_release.source.tar.gz "https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-$version-$source_release.source.tar.gz?job=Build" && tar xf librewolf-$version-$source_release.source.tar.gz && cd librewolf-$version && MOZBUILD_STATE_PATH=$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser && . /root/.cargo/env && cargo install cbindgen && cd .. && rm -rf librewolf-$version )
RUN ( wget -q -O librewolf-$version-$source_release.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-$version-$source_release.source.tar.gz?job=Build && tar xf librewolf-$version-$source_release.source.tar.gz && cd librewolf-$version && MOZBUILD_STATE_PATH=$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser && . /root/.cargo/env && cargo install cbindgen && cd .. && rm -rf librewolf-$version )
# our work happens here, on the host filesystem.
WORKDIR /work

View File

@ -13,7 +13,7 @@ use_docker=true
outfile=librewolf-$(version)-$(release).en-US.$(distro)-x86_64.tar.bz2
docker :
docker build --build-arg "distro=$(distro_image)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t librewolf/bsys5-image-$(distro) - < linux.Dockerfile
docker build --build-arg "distro=$(distro_image)" -t librewolf/bsys5-image-$(distro) - < linux.Dockerfile
build : work
if [ $(use_docker) = true ]; then \