Browse Source

Installing liberasurecode from Alpine Linux repos instead of building from source.

closes #1831136

Change-Id: Ic9a2844fffc6dba6a4d44a9712edbb5cd91f0470
changes/15/662615/3
Ehud Kaldor 2 years ago
parent
commit
17fd725707
  1. 5
      Dockerfile
  2. 7
      docker/install_scripts/10_apk_install_prereqs.sh
  3. 14
      docker/install_scripts/17_compile_liberasurecode.sh
  4. 4
      docker/install_scripts/99_apk_uninstall_dev.sh

5
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 && \

7
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 \

14
docker/install_scripts/17_compile_liberasurecode.sh

@ -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

4
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

Loading…
Cancel
Save