From 21eabe057582b0e26d277f4d7c2bfec7cdabb92e Mon Sep 17 00:00:00 2001 From: Denis Zheleztsov Date: Thu, 10 Nov 2016 17:20:46 +0300 Subject: [PATCH] Switch to Ubuntu 16.04 --- build/build.sh | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/build/build.sh b/build/build.sh index 42a29d1..237d77c 100755 --- a/build/build.sh +++ b/build/build.sh @@ -21,19 +21,19 @@ function build_builder() { CUR_DIR=$(pwd) cat > Dockerfile.builder < -COPY surok /opt/surok_build - # Install build depends RUN apt-get update RUN apt-get -y install devscripts debhelper RUN apt-get clean +COPY surok /opt/surok_build + ENTRYPOINT cd /opt/surok_build && dpkg-buildpackage -uc -us && \ mv /opt/surok_*.deb /opt/out EOF @@ -47,13 +47,15 @@ function build_package() { } function build_surok_base() { - build_builder - build_package + if [[ $1 == 'rebuild' ]]; then + build_builder + build_package + fi DEB=$(cd out && ls | grep .deb) cat > Dockerfile.surok < @@ -78,6 +80,8 @@ case $1 in build_builder build_package ;; - surok_image) build_surok_base ;; + build_deb) build_package ;; + surok_image) build_surok_base rebuild ;; + surok_image_no_rebuild) build_surok_base ;; *) usage ;; esac