Added postgresql module and composer

This commit is contained in:
Deon George 2018-05-04 23:54:52 +10:00
parent 5852061063
commit fc28d4fe09
2 changed files with 4 additions and 3 deletions

View File

@ -5,7 +5,7 @@ stages:
- build - build
variables: variables:
BRANCH: mysql BRANCH: mp
VERSION: 7.2-fpm-${BRANCH} VERSION: 7.2-fpm-${BRANCH}
CACHETAG: build-${BRANCH} CACHETAG: build-${BRANCH}
DOCKER_HOST: tcp://${CI_REGISTRY}-leenooks-ci-docker:2375 DOCKER_HOST: tcp://${CI_REGISTRY}-leenooks-ci-docker:2375

View File

@ -3,7 +3,7 @@
FROM php:7.2-fpm FROM php:7.2-fpm
RUN apt-get update && apt-get install -y openssh-server ssmtp && rm -rf /var/lib/apt/lists/* /tmp/* \ RUN apt-get update && apt-get install -y openssh-server ssmtp libpq-dev && rm -rf /var/lib/apt/lists/* /tmp/* \
&& useradd -c "Hosting Admin User" -u 1000 -g users -G www-data -d /var/www/html -M lamp \ && useradd -c "Hosting Admin User" -u 1000 -g users -G www-data -d /var/www/html -M lamp \
&& sed -i -e 's/^mailhub=mail$/mailhub=smtp/' -e "s/^hostname=/#hostname=/" -e 's/#FromLineOverride=YES/FromLineOverride=YES/' /etc/ssmtp/ssmtp.conf && sed -i -e 's/^mailhub=mail$/mailhub=smtp/' -e "s/^hostname=/#hostname=/" -e 's/#FromLineOverride=YES/FromLineOverride=YES/' /etc/ssmtp/ssmtp.conf
@ -16,4 +16,5 @@ COPY start /usr/local/sbin
ENTRYPOINT [ "/usr/local/sbin/start" ] ENTRYPOINT [ "/usr/local/sbin/start" ]
CMD [ "php-fpm" ] CMD [ "php-fpm" ]
RUN docker-php-ext-install -j$(nproc) pdo_mysql RUN docker-php-ext-install -j$(nproc) pdo_mysql pdo_pgsql
RUN curl https://getcomposer.org/installer|php -- --install-dir=/usr/local/bin --filename=composer