diff options
author | Ehud Kaldor <ehud@unfairfunction.org> | 2019-06-05 11:29:28 -0700 |
---|---|---|
committer | Ehud Kaldor <ehud@unfairfunction.org> | 2019-06-05 11:29:28 -0700 |
commit | 17fd725707c9a36fc4536bd3c955042931e314b3 (patch) | |
tree | d7300e1e6f9d3155cf7c6704ee5003e8e13d23ab /docker | |
parent | 769c0fb7fb95d3f9bfe68196af41f40e403c87fa (diff) | |
download | swift-17fd725707c9a36fc4536bd3c955042931e314b3.tar.gz |
Installing liberasurecode from Alpine Linux repos instead of building from source.
closes #1831136
Change-Id: Ic9a2844fffc6dba6a4d44a9712edbb5cd91f0470
Diffstat (limited to 'docker')
-rwxr-xr-x | docker/install_scripts/10_apk_install_prereqs.sh | 7 | ||||
-rwxr-xr-x | docker/install_scripts/17_compile_liberasurecode.sh | 14 | ||||
-rwxr-xr-x | docker/install_scripts/99_apk_uninstall_dev.sh | 4 |
3 files changed, 3 insertions, 22 deletions
diff --git a/docker/install_scripts/10_apk_install_prereqs.sh b/docker/install_scripts/10_apk_install_prereqs.sh index 58ee435a3..879530bc5 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 c346d4898..000000000 --- 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 34c9fc4fc..469f12736 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 |