travis: fix Apache Arrow installation on Ubuntu

groonga · Feb 27, 2019 · 276825c · 276825c
1 parent 7c65f39
commit 276825c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/travis/Dockerfile.ubuntu-14.04 b/travis/Dockerfile.ubuntu-14.04
@@ -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

diff --git a/travis/Dockerfile.ubuntu-16.04 b/travis/Dockerfile.ubuntu-16.04
@@ -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

diff --git a/travis/Dockerfile.ubuntu-18.04 b/travis/Dockerfile.ubuntu-18.04
@@ -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" > \