diff --git a/Makefile b/Makefile index e0c7f5fa0364b155fb143002fc4ac7053d103a42..174e930104febf9464fc46456b4f4ac1eea07954 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 59fc06f960214e9c18ab8be7c1191684c475647c..1637d363fc4c8c5f3a8183dbaf4c2eb5787d7b5f 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 f9577f354c5fe894c6ac41dcf3e5f258c3b1d25a..482021acb3efbaf366669c0357e55f613c816695 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