librewolf-bot/bsys5
1
0
Fork 0
Code Issues 7 Pull requests Projects Releases Packages Wiki Activity

changed version ENV statements into ARG statements

Browse source
This commit is contained in:
Bert van der Weerd 2022-02-08 10:39:13 +01:00
parent b860fe9c24
commit 8ab229e639
No known key found for this signature in database
GPG key ID: 4CFABB96ADE0F5B1
4 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assets/linux.Dockerfile
View file

@ -1,8 +1,8 @@
ARG distro ARG distro
FROM $distro FROM $distro
ENV version 96.0.3 ARG version=error
ENV source_release 6 ARG source_release=error
# we use this wasi version # we use this wasi version
ENV wasi_fullversion 14.0 ENV wasi_fullversion 14.0

2
assets/linux.mk
View file

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

4
assets/macos.Dockerfile
View file

@ -5,8 +5,8 @@ FROM debian:bullseye
ARG arch=error ARG arch=error
# version of librewolf we use to bootstrap (does not need to be recent) # version of librewolf we use to bootstrap (does not need to be recent)
ENV version 96.0.3 ARG version=error
ENV source_release 6 ARG source_release=error
# we use this wasi version # we use this wasi version
ENV wasi_fullversion 14.0 ENV wasi_fullversion 14.0

6
assets/macos.mk
View file

@ -12,9 +12,11 @@ use_docker=true
outfile=librewolf-$(version)-$(source_release).en-US.mac.$(arch).dmg outfile=librewolf-$(version)-$(source_release).en-US.mac.$(arch).dmg
docker : docker :
docker build --build-arg "arch=$(arch)" -t librewolf/bsys5-image-macos-$(arch) - < assets/macos.Dockerfile docker build --build-arg "arch=$(arch)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t librewolf/bsys5-image-macos-$(arch) - < assets/macos.Dockerfile
build : build : $(outfile) $(outfile).sha256sum
$(outfile) $(outfile).sha256sum :
sed "s/_ARCH_/$(arch)/g" < assets/macos.mozconfig > work/librewolf-$(version)-$(source_release)/mozconfig sed "s/_ARCH_/$(arch)/g" < assets/macos.mozconfig > work/librewolf-$(version)-$(source_release)/mozconfig
if [ $(use_docker) = true ]; then \ if [ $(use_docker) = true ]; then \
docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-macos-$(arch) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package" ; \ docker run --rm -v $(shell pwd)/work:/work:rw librewolf/bsys5-image-macos-$(arch) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package" ; \