diff options
author | kali kaneko (leap communications) <kali@leap.se> | 2020-05-07 18:09:15 +0200 |
---|---|---|
committer | kali kaneko (leap communications) <kali@leap.se> | 2020-05-07 18:55:40 +0200 |
commit | 48ec15f3b9fca0b3eb98c0aed11f01efb6d87ff3 (patch) | |
tree | 4e048803b5756f38273b39a1b00be95da85522a9 | |
parent | 283a8e6612583536918efaba9adc30cd5ffebe2c (diff) |
[pkg] add package_in_docker targets
-rw-r--r-- | Makefile | 9 | ||||
-rw-r--r-- | docker/README.md | 1 | ||||
-rwxr-xr-x | docker/builder.sh | 2 |
3 files changed, 11 insertions, 1 deletions
@@ -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 |