Sat 13 Aug 2022 11:52:27 AM CEST
This commit is contained in:
parent
ac2dfe37fc
commit
fc671470d4
7
Makefile
7
Makefile
|
@ -218,7 +218,6 @@ docker-macos-aarch64 :
|
|||
macos-aarch64 :
|
||||
${MAKE} -f assets/macos.mk arch=aarch64 build
|
||||
|
||||
<<<<<<< HEAD
|
||||
#
|
||||
# Windows
|
||||
#
|
||||
|
@ -228,14 +227,10 @@ docker-win64 :
|
|||
win64 :
|
||||
${MAKE} -f assets/windows.mk build
|
||||
|
||||
typescript :
|
||||
script -c "make clean docker-win64 win64"
|
||||
=======
|
||||
|
||||
#
|
||||
# Docker in Docker (for GitLab CI)
|
||||
#
|
||||
|
||||
docker-dind :
|
||||
docker build -f assets/dind.Dockerfile -t registry.gitlab.com/librewolf-community/browser/bsys5/dind:latest .
|
||||
>>>>>>> master
|
||||
|
||||
|
|
Loading…
Reference in New Issue