From 48ec15f3b9fca0b3eb98c0aed11f01efb6d87ff3 Mon Sep 17 00:00:00 2001 From: "kali kaneko (leap communications)" Date: Thu, 7 May 2020 18:09:15 +0200 Subject: [pkg] add package_in_docker targets --- Makefile | 9 +++++++++ docker/README.md | 1 + docker/builder.sh | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e0c7f5f..174e930 100644 --- a/Makefile +++ b/Makefile @@ -206,8 +206,17 @@ prepare_done: # packaging action ######################################################################### +builder_image: + @make -C docker build + packages: package_deb package_snap package_osx package_win +package_snap_in_docker: + @make -C docker package_snap + +package_win_in_docker: + @make -C docker package_win + package_snap: @make -C build/${PROVIDER} pkg_snap diff --git a/docker/README.md b/docker/README.md index 59fc06f..1637d36 100644 --- a/docker/README.md +++ b/docker/README.md @@ -1,4 +1,5 @@ You can use the makefile to build the image. + "make packages" will build packages inside the builder container. Use https://github.com/kalikaneko/squid-in-a-can if you want to save some bandwith while building your images. diff --git a/docker/builder.sh b/docker/builder.sh index f9577f3..482021a 100755 --- a/docker/builder.sh +++ b/docker/builder.sh @@ -12,7 +12,7 @@ case $TYPE in echo "[+] Building SNAP" make package_snap ;; - default) + *) make build ;; esac -- cgit v1.2.3