changes
This commit is contained in:
parent
5ea894e809
commit
2cd80ee2f2
13
Makefile
13
Makefile
|
@ -35,7 +35,7 @@ clean :
|
|||
|
||||
veryclean : clean
|
||||
rm -f $(tarball)
|
||||
rm -f librewolf-*-*.en-US.*-x86_64.tar.bz2
|
||||
rm -f librewolf-*-*.en-US.*-x86_64.tar.bz2 librewolf-*-*.en-US.*-x86_64.tar.bz2.sha256sum
|
||||
|
||||
prune :
|
||||
docker system prune --all --force
|
||||
|
@ -52,48 +52,39 @@ build : debian11 mint20 ubuntu20 ubuntu21 fedora34 fedora35
|
|||
push :
|
||||
docker push librewolf/bsys5-image-debian11 librewolf/bsys5-image-mint20 librewolf/bsys5-image-ubuntu20 librewolf/bsys5-image-ubuntu21 librewolf/bsys5-image-fedora34 librewolf/bsys5-image-fedora35
|
||||
|
||||
|
||||
work : $(tarball)
|
||||
mkdir work
|
||||
(cd work && tar xf ../$(tarball))
|
||||
|
||||
|
||||
|
||||
## debian11
|
||||
docker-debian11 :
|
||||
${MAKE} -f linux.mk distro=debian11 "distro_image=debian:bullseye" docker
|
||||
debian11 : work
|
||||
${MAKE} -f linux.mk distro=debian11 build
|
||||
|
||||
## mint20
|
||||
docker-mint20 :
|
||||
${MAKE} -f linux.mk distro=mint20 "distro_image=linuxmintd/mint20.2-amd64" docker
|
||||
mint20 : work
|
||||
${MAKE} -f linux.mk distro=mint20 build
|
||||
|
||||
## ubuntu20
|
||||
docker-ubuntu20 :
|
||||
${MAKE} -f linux.mk distro=ubuntu20 "distro_image=ubuntu:20.04" docker
|
||||
ubuntu20 : work
|
||||
${MAKE} -f linux.mk distro=ubuntu20 build
|
||||
|
||||
## ubuntu21
|
||||
docker-ubuntu21 :
|
||||
${MAKE} -f linux.mk distro=ubuntu21 "distro_image=ubuntu:21.10" docker
|
||||
ubuntu21 : work
|
||||
${MAKE} -f linux.mk distro=ubuntu21 build
|
||||
|
||||
|
||||
|
||||
## fedora34
|
||||
docker-fedora34 :
|
||||
${MAKE} -f linux.mk distro=fedora34 "distro_image=fedora:34" docker
|
||||
fedora34 : work
|
||||
${MAKE} -f linux.mk distro=fedora34 build
|
||||
|
||||
## fedora35
|
||||
docker-fedora35 :
|
||||
${MAKE} -f linux.mk distro=fedora35 "distro_image=fedora:35" docker
|
||||
fedora35 : work
|
||||
${MAKE} -f linux.mk distro=fedora35 build
|
||||
|
||||
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
ARG version
|
||||
ARG source_release
|
||||
ARG distro
|
||||
FROM $distro
|
||||
|
||||
|
@ -11,7 +13,7 @@ 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 the bootstrap
|
||||
RUN ( wget -q -O librewolf-96.0.3-3.source.tar.gz "https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-96.0.3-3.source.tar.gz?job=Build" && tar xf librewolf-96.0.3-3.source.tar.gz && cd librewolf-96.0.3 && MOZBUILD_STATE_PATH=$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser && . /root/.cargo/env && cargo install cbindgen && cd .. && rm -rf librewolf-96.0.3 )
|
||||
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
|
||||
|
|
4
linux.mk
4
linux.mk
|
@ -2,7 +2,7 @@
|
|||
# $(distro_image)
|
||||
# $(use_docker)
|
||||
|
||||
.PHONY : docker build ci
|
||||
.PHONY : docker build
|
||||
|
||||
version:=$(shell cat version)
|
||||
release:=$(shell cat release)
|
||||
|
@ -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)" -t librewolf/bsys5-image-$(distro) - < linux.Dockerfile
|
||||
docker build --build-arg "distro=$(distro_image)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t librewolf/bsys5-image-$(distro) - < linux.Dockerfile
|
||||
|
||||
build : work
|
||||
if [ $(use_docker) = true ]; then \
|
||||
|
|
Loading…
Reference in New Issue