fix(): missing php extensions

pull/3/head
Hardware 2016-07-16 12:07:10 +02:00
parent 6170a65bec
commit 6f1bb34076
No known key found for this signature in database
GPG Key ID: EC6DF6F90263EDEA
4 changed files with 22 additions and 1906 deletions

View File

@ -6,19 +6,21 @@ ENV GID=991 UID=991
RUN echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ RUN echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
&& export BUILD_DEPS="git" \ && export BUILD_DEPS="git" \
&& apk --no-cache add nginx \ && apk --no-cache add ${BUILD_DEPS} \
curl \ nginx \
php7-phar@testing \ curl \
supervisor \ supervisor \
php7-fpm@testing \ php7-phar@testing \
php7-curl@testing \ php7-fpm@testing \
php7-mbstring@testing \ php7-curl@testing \
php7-openssl@testing \ php7-mbstring@testing \
php7-json@testing \ php7-openssl@testing \
php7-pdo_mysql@testing \ php7-json@testing \
php7-gd@testing \ php7-pdo_mysql@testing \
php7-dom@testing \ php7-gd@testing \
${BUILD_DEPS} \ php7-dom@testing \
php7-ctype@testing \
php7-session@testing \
&& cd /tmp \ && cd /tmp \
&& ln -s /usr/bin/php7 /usr/bin/php \ && ln -s /usr/bin/php7 /usr/bin/php \
&& curl -s http://getcomposer.org/installer | php \ && curl -s http://getcomposer.org/installer | php \
@ -32,11 +34,8 @@ RUN echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/r
&& rm -rf /flarum/.composer/cache/* && rm -rf /flarum/.composer/cache/*
COPY nginx.conf /etc/nginx/nginx.conf COPY nginx.conf /etc/nginx/nginx.conf
COPY php.ini /etc/php7/php.ini
COPY php-fpm.conf /etc/php7/php-fpm.conf COPY php-fpm.conf /etc/php7/php-fpm.conf
COPY supervisord.conf /etc/supervisor/supervisord.conf COPY supervisord.conf /etc/supervisor/supervisord.conf
COPY startup /usr/local/bin/startup
RUN chmod +x /usr/local/bin/startup
EXPOSE 8080 EXPOSE 8080
CMD ["/usr/bin/tini","--","startup"] CMD ["/usr/bin/tini","--","supervisord","-c","/etc/supervisor/supervisord.conf"]

View File

@ -55,17 +55,16 @@ http {
error_log /var/log/nginx/error.log error; error_log /var/log/nginx/error.log error;
charset utf-8; charset utf-8;
location / {
location / { try_files $uri $uri/ /index.php?$query_string;
try_files $uri $uri/ /index.php?$query_string;
} }
location /api { location /api {
try_files $uri $uri/ /api.php?$query_string; try_files $uri $uri/ /api.php?$query_string;
} }
location /admin { location /admin {
try_files $uri $uri/ /admin.php?$query_string; try_files $uri $uri/ /admin.php?$query_string;
} }
location /flarum { location /flarum {

1872
php.ini

File diff suppressed because it is too large Load Diff

10
startup
View File

@ -1,10 +0,0 @@
#!/bin/sh
# Create user and group
# addgroup -g ${GID} flarum && adduser -h /flarum -s /bin/sh -D -G flarum -u ${UID} flarum
# Set permissions
chown -R flarum:flarum /flarum /var/lib/nginx /tmp
# RUN !
supervisord -c /etc/supervisor/supervisord.conf