changed version ENV statements into ARG statements
This commit is contained in:
parent
b860fe9c24
commit
8ab229e639
|
@ -1,8 +1,8 @@
|
|||
ARG distro
|
||||
FROM $distro
|
||||
|
||||
ENV version 96.0.3
|
||||
ENV source_release 6
|
||||
ARG version=error
|
||||
ARG source_release=error
|
||||
|
||||
# we use this wasi version
|
||||
ENV wasi_fullversion 14.0
|
||||
|
|
|
@ -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) - < 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
|
||||
|
||||
|
|
|
@ -5,8 +5,8 @@ FROM debian:bullseye
|
|||
ARG arch=error
|
||||
|
||||
# version of librewolf we use to bootstrap (does not need to be recent)
|
||||
ENV version 96.0.3
|
||||
ENV source_release 6
|
||||
ARG version=error
|
||||
ARG source_release=error
|
||||
|
||||
# we use this wasi version
|
||||
ENV wasi_fullversion 14.0
|
||||
|
|
|
@ -12,9 +12,11 @@ use_docker=true
|
|||
outfile=librewolf-$(version)-$(source_release).en-US.mac.$(arch).dmg
|
||||
|
||||
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
|
||||
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" ; \
|
||||
|
|
Loading…
Reference in New Issue