testing
This commit is contained in:
parent
9de855e7ef
commit
1a52e7f6e4
3 changed files with 3 additions and 3 deletions
|
|
@ -35,7 +35,7 @@ Build Docker Images:
|
||||||
# Build container
|
# Build container
|
||||||
script:
|
script:
|
||||||
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
|
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
|
||||||
- make docker-$DISTRO
|
- DOCKER_HOST="tcp://docker:2375" make docker-$DISTRO
|
||||||
- docker push $CI_REGISTRY/librewolf-community/browser/bsys5/$DISTRO:latest
|
- docker push $CI_REGISTRY/librewolf-community/browser/bsys5/$DISTRO:latest
|
||||||
|
|
||||||
Build:
|
Build:
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo "
|
||||||
outfile=librewolf-$(full_version).en-US.$(distro)-x86_64.tar.bz2
|
outfile=librewolf-$(full_version).en-US.$(distro)-x86_64.tar.bz2
|
||||||
|
|
||||||
docker :
|
docker :
|
||||||
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
|
docker build --build-arg "distro=$(distro_image)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t $(CI_REGISTRY)/librewolf-community/browser/bsys5/$(distro):latest - < assets/linux.Dockerfile
|
||||||
|
|
||||||
build : $(outfile) $(outfile).sha256sum
|
build : $(outfile) $(outfile).sha256sum
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo "
|
||||||
outfile=librewolf-$(full_version).en-US.mac.$(arch).dmg
|
outfile=librewolf-$(full_version).en-US.mac.$(arch).dmg
|
||||||
|
|
||||||
docker :
|
docker :
|
||||||
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
|
docker build --build-arg "arch=$(arch)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t $(CI_REGISTRY)/librewolf-community/browser/bsys5/macos:$(arch) - < assets/macos.Dockerfile
|
||||||
|
|
||||||
build : $(outfile) $(outfile).sha256sum
|
build : $(outfile) $(outfile).sha256sum
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue