From c039ae197e927c81663ace28850a39c3b456871b Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Thu, 30 Sep 2021 00:20:14 +0200 Subject: [PATCH] fixes --- docker/Makefile | 1 - docker/built-image/Dockerfile | 16 ---------------- docker/librewolf/debian/Dockerfile | 17 ++++++++++++++++- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/docker/Makefile b/docker/Makefile index 4a02031..875a7cb 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -3,7 +3,6 @@ all : make -C buildenv make -C fetched-image - make -C built-image make -C librewolf clean : diff --git a/docker/built-image/Dockerfile b/docker/built-image/Dockerfile index 0f1b113..e69de29 100644 --- a/docker/built-image/Dockerfile +++ b/docker/built-image/Dockerfile @@ -1,16 +0,0 @@ -from librewolf/fetched-image -# dependencies -run apt-get install -y git - -workdir / -run git clone --recursive https://gitlab.com/librewolf-community/browser/windows.git -workdir windows -run ln -s /firefox-$(cat /version) -run ls -l -run pwd -run ls -l / -run python3 build.py --version $(cat /version) fetch -run python3 build.py lw_do_patches -run python3 build.py build -run python3 build.py lw_post_build -run python3 build.py package diff --git a/docker/librewolf/debian/Dockerfile b/docker/librewolf/debian/Dockerfile index 7f2274f..3648453 100644 --- a/docker/librewolf/debian/Dockerfile +++ b/docker/librewolf/debian/Dockerfile @@ -1,2 +1,17 @@ -from librewolf/built-image +from librewolf/fetched-image +# dependencies +run apt-get install -y git + +workdir / +run git clone --recursive https://gitlab.com/librewolf-community/browser/windows.git +workdir windows +run ln -s /firefox-$(cat /version) +run ls -l +run pwd +run ls -l / +run python3 build.py --version $(cat /version) fetch +run python3 build.py lw_do_patches +run python3 build.py build +run python3 build.py lw_post_build +run python3 build.py package run python3 build.py lw_artifacts