Repository: aurora-packaging Updated Branches: refs/heads/master d5d41691c -> aa9bd2de9
Use `gdebi` for auto dep resolution. This makes us more robust to upstream packaging changes. The `gdebi` tool gives us `apt-get install` dependency calculation, fetching and install for a local deb package. Bugs closed: AURORA-1687 Reviewed at https://reviews.apache.org/r/46897/ Project: http://git-wip-us.apache.org/repos/asf/aurora-packaging/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora-packaging/commit/aa9bd2de Tree: http://git-wip-us.apache.org/repos/asf/aurora-packaging/tree/aa9bd2de Diff: http://git-wip-us.apache.org/repos/asf/aurora-packaging/diff/aa9bd2de Branch: refs/heads/master Commit: aa9bd2de90e6abdbd4c3a05f2463c7d920539aaf Parents: d5d4169 Author: John Sirois <[email protected]> Authored: Mon May 2 13:09:59 2016 -0600 Committer: John Sirois <[email protected]> Committed: Mon May 2 13:09:59 2016 -0600 ---------------------------------------------------------------------- builder/deb/debian-jessie/Dockerfile | 5 +++-- builder/deb/ubuntu-trusty/Dockerfile | 11 ++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/aa9bd2de/builder/deb/debian-jessie/Dockerfile ---------------------------------------------------------------------- diff --git a/builder/deb/debian-jessie/Dockerfile b/builder/deb/debian-jessie/Dockerfile index 50b5081..0b9e37b 100644 --- a/builder/deb/debian-jessie/Dockerfile +++ b/builder/deb/debian-jessie/Dockerfile @@ -39,9 +39,10 @@ RUN apt-get -y -t jessie-backports install openjdk-8-jdk \ # Install gradle. RUN git clone --depth 1 https://github.com/benley/gradle-packaging \ && cd gradle-packaging \ - && apt-get install -y ruby ruby-dev unzip wget \ + && apt-get -y install ruby ruby-dev unzip wget \ && gem install fpm && ./gradle-mkdeb.sh 2.12 \ - && dpkg -i gradle-2.12_2.12-2_all.deb \ + && apt-get -y install gdebi-core \ + && gdebi --non-interactive gradle-2.12_2.12-2_all.deb \ && cd .. && rm -rf gradle-packaging ADD build.sh /build.sh http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/aa9bd2de/builder/deb/ubuntu-trusty/Dockerfile ---------------------------------------------------------------------- diff --git a/builder/deb/ubuntu-trusty/Dockerfile b/builder/deb/ubuntu-trusty/Dockerfile index 21617e7..ff50b8f 100644 --- a/builder/deb/ubuntu-trusty/Dockerfile +++ b/builder/deb/ubuntu-trusty/Dockerfile @@ -29,23 +29,24 @@ RUN apt-get update && apt-get -y install \ python-all-dev \ software-properties-common -RUN add-apt-repository ppa:openjdk-r/ppa -y \ +RUN add-apt-repository -y ppa:openjdk-r/ppa \ && apt-get update \ - && apt-get install -y openjdk-8-jdk \ + && apt-get -y install openjdk-8-jdk \ && update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java RUN curl -sSL http://apache.org/dist/thrift/KEYS | gpg --import - && \ gpg --export --armor 66B778F9 | sudo apt-key add - && \ echo 'deb http://www.apache.org/dist/thrift/debian 0.9.1 main' > /etc/apt/sources.list.d/thrift.list && \ apt-get update && \ - apt-get install thrift-compiler=0.9.1 + apt-get -y install thrift-compiler=0.9.1 # Install gradle. RUN git clone --depth 1 https://github.com/benley/gradle-packaging \ && cd gradle-packaging \ - && apt-get install -y ruby ruby-dev unzip wget \ + && apt-get -y install ruby ruby-dev unzip wget \ && gem install fpm && ./gradle-mkdeb.sh 2.12 \ - && dpkg -i gradle-2.12_2.12-2_all.deb \ + && apt-get -y install gdebi-core \ + && gdebi --non-interactive gradle-2.12_2.12-2_all.deb \ && cd .. && rm -rf gradle-packaging ADD build.sh /build.sh
