Kouhei Sutou 2019-02-27 17:53:06 +0900 (Wed, 27 Feb 2019) Revision: 276825c5482b68aeaddfd41929d2ee553668f044 https://github.com/groonga/groonga/commit/276825c5482b68aeaddfd41929d2ee553668f044 Message: travis: fix Apache Arrow installation on Ubuntu Modified files: travis/Dockerfile.ubuntu-14.04 travis/Dockerfile.ubuntu-16.04 travis/Dockerfile.ubuntu-18.04 Modified: travis/Dockerfile.ubuntu-14.04 (+6 -4) =================================================================== --- travis/Dockerfile.ubuntu-14.04 2019-02-27 17:50:27 +0900 (1a712fb0e) +++ travis/Dockerfile.ubuntu-14.04 2019-02-27 17:53:06 +0900 (f4b5de154) @@ -34,10 +34,12 @@ RUN \ RUN \ apt update -qq && \ - apt install -qq -y apt-transport-https lsb-release && \ - wget -O /usr/share/keyrings/apache-arrow-keyring.gpg \ - https://dl.bintray.com/apache/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/apache-arrow-keyring.gpg && \ - echo "deb [arch=amd64 signed-by=/usr/share/keyrings/apache-arrow-keyring.gpg] https://dl.bintray.com/apache/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/ $(lsb_release --codename --short) main" > \ + apt install -qq -y \ + apt-transport-https \ + curl \ + lsb-release && \ + curl https://dist.apache.org/repos/dist/dev/arrow/KEYS | apt-key add - \ + echo "deb [arch=amd64] https://dl.bintray.com/apache/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/ $(lsb_release --codename --short) main" > \ /etc/apt/sources.list.d/apache-arrow.list && \ apt update -qq && \ apt install -qq -y libarrow-dev Modified: travis/Dockerfile.ubuntu-16.04 (+6 -4) =================================================================== --- travis/Dockerfile.ubuntu-16.04 2019-02-27 17:50:27 +0900 (9fd1cb9bc) +++ travis/Dockerfile.ubuntu-16.04 2019-02-27 17:53:06 +0900 (d0c921602) @@ -35,10 +35,12 @@ RUN \ RUN \ apt update -qq && \ - apt install -qq -y apt-transport-https lsb-release && \ - wget -O /usr/share/keyrings/apache-arrow-keyring.gpg \ - https://dl.bintray.com/apache/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/apache-arrow-keyring.gpg && \ - echo "deb [arch=amd64 signed-by=/usr/share/keyrings/apache-arrow-keyring.gpg] https://dl.bintray.com/apache/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/ $(lsb_release --codename --short) main" > \ + apt install -qq -y \ + apt-transport-https \ + curl \ + lsb-release && \ + curl https://dist.apache.org/repos/dist/dev/arrow/KEYS | apt-key add - \ + echo "deb [arch=amd64] https://dl.bintray.com/apache/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/ $(lsb_release --codename --short) main" > \ /etc/apt/sources.list.d/apache-arrow.list && \ apt update -qq && \ apt install -qq -y libarrow-dev Modified: travis/Dockerfile.ubuntu-18.04 (+4 -1) =================================================================== --- travis/Dockerfile.ubuntu-18.04 2019-02-27 17:50:27 +0900 (02b7c775d) +++ travis/Dockerfile.ubuntu-18.04 2019-02-27 17:53:06 +0900 (81e4411e5) @@ -37,7 +37,10 @@ RUN \ RUN \ apt update -qq && \ - apt install -qq -y apt-transport-https lsb-release && \ + apt install -qq -y \ + apt-transport-https \ + lsb-release \ + wget && \ wget -O /usr/share/keyrings/apache-arrow-keyring.gpg \ https://dl.bintray.com/apache/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/apache-arrow-keyring.gpg && \ echo "deb [arch=amd64 signed-by=/usr/share/keyrings/apache-arrow-keyring.gpg] https://dl.bintray.com/apache/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/ $(lsb_release --codename --short) main" > \ -------------- next part -------------- An HTML attachment was scrubbed... URL: <https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20190227/ce455683/attachment-0001.html>
