Skip to content

Commit

Permalink
HOTFIX of php-fpm image after BC-breaking update of dependent image, …
Browse files Browse the repository at this point in the history
…application is BUILDABLE, acceptance tests FAIL
  • Loading branch information
PetrHeinz committed Apr 23, 2018
1 parent f4294f9 commit 36df504
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions project-base/docker/php-fpm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN apt-get update && apt-get -y install acl
RUN apt-get update && apt-get -y install git

# Install PostgreSQL client for dumping database
RUN apt-get update && apt-get -y install postgresql-client-9.5
RUN apt-get update && apt-get -y install postgresql-client-10

# Install locales and switch to en_US.utf8 in order to enable UTF-8 support.
# See https://perlgeek.de/en/article/set-up-a-clean-utf8-environment
Expand Down Expand Up @@ -43,10 +43,8 @@ RUN php -r "copy('https://getcomposer.org/download/1.5.1/composer.phar', '/usr/l
&& chmod 0755 /usr/local/bin/composer \
&& /usr/local/bin/composer selfupdate --stable

# Install Node.js v6 from NodeSource repository that also contains NPM.
# See https://nodejs.org/en/download/package-manager/#debian-and-ubuntu-based-linux-distributions
RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - \
&& apt-get update && apt-get -y install nodejs=6.*
RUN apt-get update && apt-get -y install nodejs
RUN apt-get update && apt-get -y install npm

# Install grunt-cli using npm to be able to run grunt watch.
RUN npm install -g grunt-cli
Expand Down

0 comments on commit 36df504

Please sign in to comment.