Skip to content
This repository has been archived by the owner on Nov 9, 2023. It is now read-only.

Commit

Permalink
Enabling intl compile option for PHP
Browse files Browse the repository at this point in the history
Bump PHP release to 3

[ci skip]
  • Loading branch information
yangkookkim committed May 6, 2016
1 parent a63cf93 commit c091274
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 11 deletions.
3 changes: 1 addition & 2 deletions build-package
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ version=$2
release=$3
install_dir=$4
deb=circleci-${package}-${version}_${release}_amd64.deb
image=kimh/package_builder
image=kimh/package_builder-$package

cd $package

Expand All @@ -28,4 +28,3 @@ popd
# docker build --build-arg package=${package} --build-arg version=${version} --build-arg install_dir=${install_dir} -t kimh/${package}-test:${version} .
# popd
#fi

9 changes: 1 addition & 8 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ machine:

python_release: 1
ruby_release: 1
php_release: 2
php_release: 3
nodejs_release: 1

dependencies:
Expand Down Expand Up @@ -114,10 +114,3 @@ test:

: parallel: true
timeout: 3600

#deployment:
# production:
# branch: master
# commands:
# # Packagecloud doesn't allow to override, so only new packages will be pushed.
# - for p in $(find ./ | grep _amd64.deb); do package_cloud push circleci/trusty/ubuntu/trusty $p; done; true
6 changes: 5 additions & 1 deletion php/src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARG release
ARG install_dir
RUN mkdir -p ${install_dir}

ENV deps "libpng12-dev re2c m4 libxslt1-dev libjpeg-dev libxml2-dev libtidy-dev libmcrypt-dev libreadline-dev libmagic-dev libssl-dev libcurl4-openssl-dev libfreetype6-dev libapache2-mod-php5 apache2-dev autoconf"
ENV deps "libpng12-dev re2c m4 libxslt1-dev libjpeg-dev libxml2-dev libtidy-dev libmcrypt-dev libreadline-dev libmagic-dev libssl-dev libcurl4-openssl-dev libfreetype6-dev libapache2-mod-php5 libicu-dev apache2-dev autoconf"

RUN apt-get update && apt-get -y install $deps

Expand All @@ -18,6 +18,10 @@ RUN sed -i 's/--without-pear//' /usr/local/share/php-build/default_configure_opt
# Prepending the line because otherwise php-build ignores the line (probably a bug of php-build)
RUN sed -i -e '1iwith_apxs2 "/usr/bin/apxs2"' /usr/local/share/php-build/definitions/*

# Enabling intl
# Customer request: https://discuss.circleci.com/t/ubuntu-trusty-has-no-pecl-support-under-php7/3700/10
RUN echo '--enable-intl' | tee -a /usr/local/share/php-build/default_configure_options

RUN php-build -i development ${version} ${install_dir}

RUN fpm -s dir -t deb -C ${install_dir} \
Expand Down

0 comments on commit c091274

Please sign in to comment.