Skip to content
Snippets Groups Projects
Commit 20f900dc authored by Stanley Cheung's avatar Stanley Cheung
Browse files

remove outdated php dockerfile dependency

parent da9af333
Branches
Tags
No related merge requests found
...@@ -29,11 +29,7 @@ ...@@ -29,11 +29,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
set -e set -e
default_extension_dir=$(php-config --extension-dir) default_extension_dir=$(php-config --extension-dir)
if command -v brew > /dev/null && \ if [ ! -e $default_extension_dir/grpc.so ]; then
brew ls --versions | grep php5[56]-grpc > /dev/null; then
# the grpc php extension was installed by homebrew
:
elif [ ! -e $default_extension_dir/grpc.so ]; then
# the grpc extension is not found in the default PHP extension dir # the grpc extension is not found in the default PHP extension dir
# try the source modules directory # try the source modules directory
module_dir=../ext/grpc/modules module_dir=../ext/grpc/modules
......
...@@ -3,11 +3,5 @@ ...@@ -3,11 +3,5 @@
# Install dependencies # Install dependencies
RUN /bin/bash -l -c "echo 'deb http://packages.dotdeb.org wheezy-php55 all' ${'\\'}
>> /etc/apt/sources.list.d/dotdeb.list"
RUN /bin/bash -l -c "echo 'deb-src http://packages.dotdeb.org wheezy-php55 all' ${'\\'}
>> /etc/apt/sources.list.d/dotdeb.list"
RUN wget http://www.dotdeb.org/dotdeb.gpg -O- | apt-key add -
RUN apt-get update && apt-get install -y ${'\\'} RUN apt-get update && apt-get install -y ${'\\'}
git php5 php5-dev phpunit unzip git php5 php5-dev phpunit unzip
...@@ -98,12 +98,6 @@ RUN /bin/bash -l -c "gem install bundler --no-ri --no-rdoc" ...@@ -98,12 +98,6 @@ RUN /bin/bash -l -c "gem install bundler --no-ri --no-rdoc"
# Install dependencies # Install dependencies
RUN /bin/bash -l -c "echo 'deb http://packages.dotdeb.org wheezy-php55 all' \
>> /etc/apt/sources.list.d/dotdeb.list"
RUN /bin/bash -l -c "echo 'deb-src http://packages.dotdeb.org wheezy-php55 all' \
>> /etc/apt/sources.list.d/dotdeb.list"
RUN wget http://www.dotdeb.org/dotdeb.gpg -O- | apt-key add -
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
git php5 php5-dev phpunit unzip git php5 php5-dev phpunit unzip
......
...@@ -103,12 +103,6 @@ RUN pip install --upgrade google-api-python-client ...@@ -103,12 +103,6 @@ RUN pip install --upgrade google-api-python-client
# Install dependencies # Install dependencies
RUN /bin/bash -l -c "echo 'deb http://packages.dotdeb.org wheezy-php55 all' \
>> /etc/apt/sources.list.d/dotdeb.list"
RUN /bin/bash -l -c "echo 'deb-src http://packages.dotdeb.org wheezy-php55 all' \
>> /etc/apt/sources.list.d/dotdeb.list"
RUN wget http://www.dotdeb.org/dotdeb.gpg -O- | apt-key add -
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
git php5 php5-dev phpunit unzip git php5 php5-dev phpunit unzip
......
...@@ -100,12 +100,6 @@ RUN /bin/bash -l -c "nvm alias default 4" ...@@ -100,12 +100,6 @@ RUN /bin/bash -l -c "nvm alias default 4"
# Install dependencies # Install dependencies
RUN /bin/bash -l -c "echo 'deb http://packages.dotdeb.org wheezy-php55 all' \
>> /etc/apt/sources.list.d/dotdeb.list"
RUN /bin/bash -l -c "echo 'deb-src http://packages.dotdeb.org wheezy-php55 all' \
>> /etc/apt/sources.list.d/dotdeb.list"
RUN wget http://www.dotdeb.org/dotdeb.gpg -O- | apt-key add -
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
git php5 php5-dev phpunit unzip git php5 php5-dev phpunit unzip
......
...@@ -83,12 +83,6 @@ RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.0.0a2 six==1.10.0 ...@@ -83,12 +83,6 @@ RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.0.0a2 six==1.10.0
# Install dependencies # Install dependencies
RUN /bin/bash -l -c "echo 'deb http://packages.dotdeb.org wheezy-php55 all' \
>> /etc/apt/sources.list.d/dotdeb.list"
RUN /bin/bash -l -c "echo 'deb-src http://packages.dotdeb.org wheezy-php55 all' \
>> /etc/apt/sources.list.d/dotdeb.list"
RUN wget http://www.dotdeb.org/dotdeb.gpg -O- | apt-key add -
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
git php5 php5-dev phpunit unzip git php5 php5-dev phpunit unzip
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment