ykxiao
/
laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix build error for PHP-FPM Audiowaveform 

#3017, #3030, #3031
This commit is contained in:
Shao Yu-Lung (Allen) 2021-07-29 17:24:39 +08:00
parent 15e65664e9
commit 00ee9d74d5
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/main-ci.yml vendored
View File

@ -38,7 +38,6 @@ jobs:
sed -i -- 's/OCI8=true/OCI8=false/g' .env sed -i -- 's/OCI8=true/OCI8=false/g' .env
sed -i -- 's/IONCUBE=true/IONCUBE=false/g' .env sed -i -- 's/IONCUBE=true/IONCUBE=false/g' .env
sed -i -- 's/V8JS=true/V8JS=false/g' .env sed -i -- 's/V8JS=true/V8JS=false/g' .env
sed -i -- 's/AUDIOWAVEFORM=true/AUDIOWAVEFORM=false/g' .env
docker-compose build ${{ matrix.service }} docker-compose build ${{ matrix.service }}
docker-compose up -d --no-deps -- ${{ matrix.service }} docker-compose up -d --no-deps -- ${{ matrix.service }}
docker-compose exec -T -- ${{ matrix.service }} php -m docker-compose exec -T -- ${{ matrix.service }} php -m

6
php-fpm/Dockerfile
View File

@ -990,12 +990,10 @@ ARG INSTALL_AUDIOWAVEFORM=false
RUN if [ ${INSTALL_AUDIOWAVEFORM} = true ]; then \ RUN if [ ${INSTALL_AUDIOWAVEFORM} = true ]; then \
apt-get -y install wget make cmake gcc g++ libmad0-dev libid3tag0-dev libsndfile1-dev libgd-dev libboost-filesystem-dev libboost-program-options-dev libboost-regex-dev \ apt-get -y install wget make cmake gcc g++ libmad0-dev libid3tag0-dev libsndfile1-dev libgd-dev libboost-filesystem-dev libboost-program-options-dev libboost-regex-dev \
&& cd /tmp \
&& git clone https://github.com/bbc/audiowaveform.git \ && git clone https://github.com/bbc/audiowaveform.git \
&& cd audiowaveform \ && cd audiowaveform \
&& wget https://github.com/google/googletest/archive/release-1.10.0.tar.gz \ && git clone --depth=1 https://github.com/google/googletest.git -b release-1.11.0 \
&& tar xzf release-1.10.0.tar.gz \
&& ln -s googletest-release-1.10.0/googletest googletest \
&& ln -s googletest-release-1.10.0/googlemock googlemock \
&& mkdir build \ && mkdir build \
&& cd build \ && cd build \
&& cmake .. \ && cmake .. \