From 17fd725707c9a36fc4536bd3c955042931e314b3 Mon Sep 17 00:00:00 2001
From: Ehud Kaldor <ehud@unfairfunction.org>
Date: Wed, 5 Jun 2019 11:29:28 -0700
Subject: [PATCH] Installing liberasurecode from Alpine Linux repos instead of
 building from source.

closes #1831136

Change-Id: Ic9a2844fffc6dba6a4d44a9712edbb5cd91f0470
---
 Dockerfile                                         |  5 -----
 docker/install_scripts/10_apk_install_prereqs.sh   |  7 +++----
 .../install_scripts/17_compile_liberasurecode.sh   | 14 --------------
 docker/install_scripts/99_apk_uninstall_dev.sh     |  4 ----
 4 files changed, 3 insertions(+), 27 deletions(-)
 delete mode 100755 docker/install_scripts/17_compile_liberasurecode.sh

diff --git a/Dockerfile b/Dockerfile
index 00b16b434c..22187f0c3e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,11 +35,6 @@ RUN         mkdir /etc/swift && \
             echo && \
             echo && \
             echo && \
-            echo "================   compiling liberasurecode  ===================" && \
-            /opt/swift/docker/install_scripts/17_compile_liberasurecode.sh && \
-            echo && \
-            echo && \
-            echo && \
             echo "================   starting swift_install  ===================" && \
             /opt/swift/docker/install_scripts/50_swift_install.sh && \
             echo && \
diff --git a/docker/install_scripts/10_apk_install_prereqs.sh b/docker/install_scripts/10_apk_install_prereqs.sh
index 58ee435a3f..879530bc53 100755
--- a/docker/install_scripts/10_apk_install_prereqs.sh
+++ b/docker/install_scripts/10_apk_install_prereqs.sh
@@ -1,7 +1,10 @@
 #!/bin/sh
 
+echo "@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
 apk add --update \
   linux-headers \
+  liberasurecode@testing \
+  liberasurecode-dev@testing \
   gnupg \
   git \
   curl \
@@ -13,10 +16,6 @@ apk add --update \
   sqlite-libs \
   sqlite-dev \
   xfsprogs \
-  autoconf \
-  automake \
-  libtool \
-  make \
   zlib-dev \
   g++ \
   libffi \
diff --git a/docker/install_scripts/17_compile_liberasurecode.sh b/docker/install_scripts/17_compile_liberasurecode.sh
deleted file mode 100755
index c346d4898f..0000000000
--- a/docker/install_scripts/17_compile_liberasurecode.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-# Get liberasurecode
-cd $BUILD_DIR
-git clone https://github.com/openstack/liberasurecode.git
-cd liberasurecode/
-./autogen.sh
-./configure
-make
-#make test
-make install
-# cp -r /usr/local/lib /usr/lib/python3.6/site-packages/ && \
-cd $BUILD_DIR
-rm -rf $BUILD_DIR/liberasurecode
diff --git a/docker/install_scripts/99_apk_uninstall_dev.sh b/docker/install_scripts/99_apk_uninstall_dev.sh
index 34c9fc4fc4..469f12736d 100755
--- a/docker/install_scripts/99_apk_uninstall_dev.sh
+++ b/docker/install_scripts/99_apk_uninstall_dev.sh
@@ -7,10 +7,6 @@ apk del gnupg
 apk del git
 apk del openssl-dev
 apk del sqlite-dev
-apk del autoconf
-apk del automake
-apk del libtool
-apk del make
 apk del zlib-dev
 apk del g++
 apk del libffi-dev