Skip to content

Commit

Permalink
Updated to php7 and added support to Symfony4
Browse files Browse the repository at this point in the history
  • Loading branch information
eko committed Sep 22, 2017
1 parent 51670d3 commit f47d8b5
Show file tree
Hide file tree
Showing 8 changed files with 50 additions and 48 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
@@ -1,7 +1,7 @@
sudo: required

env:
DOCKER_COMPOSE_VERSION: 1.7.1
DOCKER_COMPOSE_VERSION: 1.16.1

services:
- docker
Expand Down
14 changes: 7 additions & 7 deletions README.md
Expand Up @@ -4,7 +4,7 @@ docker-symfony
[![Build Status](https://secure.travis-ci.org/eko/docker-symfony.png?branch=master)](http://travis-ci.org/eko/docker-symfony)


Just a little Docker POC in order to have a complete stack for running Symfony into Docker containers using docker-compose tool.
This is a complete stack for running Symfony 4 (latest version: Flex) into Docker containers using docker-compose tool.

# Installation

Expand Down Expand Up @@ -45,12 +45,12 @@ This results in the following running containers:

```bash
> $ docker-compose ps
Name Command State Ports
-------------------------------------------------------------------------------------------
docker_db_1 /entrypoint.sh mysqld Up 0.0.0.0:3306->3306/tcp
docker_elk_1 /usr/bin/supervisord -n -c ... Up 0.0.0.0:81->80/tcp
docker_nginx_1 nginx Up 443/tcp, 0.0.0.0:80->80/tcp
docker_php_1 php5-fpm -F Up 9000/tcp
Name Command State Ports
--------------------------------------------------------------------------------------------
dockersymfony_db_1 docker-entrypoint.sh mysqld Up 0.0.0.0:3306->3306/tcp
dockersymfony_elk_1 /usr/bin/supervisord -n -c ... Up 0.0.0.0:81->80/tcp
dockersymfony_nginx_1 nginx Up 443/tcp, 0.0.0.0:80->80/tcp
dockersymfony_php_1 php-fpm7 -F Up 0.0.0.0:9000->9000/tcp
```

# Read logs
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.travis.yml
Expand Up @@ -13,7 +13,7 @@ services:
- "9000"
volumes:
- ./symfony:/var/www/symfony
- ./logs/symfony:/var/www/symfony/app/logs
- ./logs/symfony:/var/www/symfony/var/logs
links:
- db
nginx:
Expand Down
14 changes: 7 additions & 7 deletions docker-compose.yml
Expand Up @@ -11,11 +11,11 @@ services:
MYSQL_PASSWORD: symfony
php:
build: ./php-fpm
expose:
- "9000"
ports:
- "9000:9000"
volumes:
- ./symfony:/var/www/symfony
- ./logs/symfony:/var/www/symfony/app/logs
- ./symfony:/var/www/symfony:cached
- ./logs/symfony:/var/www/symfony/var/logs:cached
links:
- db
nginx:
Expand All @@ -27,14 +27,14 @@ services:
volumes_from:
- php
volumes:
- ./logs/nginx/:/var/log/nginx
- ./logs/nginx/:/var/log/nginx:cached
elk:
image: willdurand/elk
ports:
- "81:80"
volumes:
- ./elk/logstash:/etc/logstash
- ./elk/logstash/patterns:/opt/logstash/patterns
- ./elk/logstash:/etc/logstash:cached
- ./elk/logstash/patterns:/opt/logstash/patterns:cached
volumes_from:
- php
- nginx
4 changes: 2 additions & 2 deletions elk/logstash/logstash.conf
Expand Up @@ -6,12 +6,12 @@ input {
}
file {
type => "symfony_dev"
path => "/var/www/symfony/app/logs/dev.log"
path => "/var/www/symfony/var/logs/dev.log"
start_position => beginning
}
file {
type => "symfony_prod"
path => "/var/www/symfony/app/logs/prod.log"
path => "/var/www/symfony/var/logs/prod.log"
start_position => beginning
}
}
Expand Down
2 changes: 1 addition & 1 deletion nginx/Dockerfile
@@ -1,4 +1,4 @@
FROM alpine:3.4
FROM alpine:3.6

MAINTAINER Vincent Composieux <vincent.composieux@gmail.com>

Expand Down
6 changes: 3 additions & 3 deletions nginx/symfony.conf
@@ -1,17 +1,17 @@
server {
server_name symfony.dev;
root /var/www/symfony/web;
root /var/www/symfony/public;


location / {
try_files $uri @rewriteapp;
}

location @rewriteapp {
rewrite ^(.*)$ /app.php/$1 last;
rewrite ^(.*)$ /index.php/$1 last;
}

location ~ ^/(app|app_dev|config)\.php(/|$) {
location ~ ^/index\.php(/|$) {
fastcgi_pass php-upstream;
fastcgi_split_path_info ^(.+\.php)(/.*)$;
include fastcgi_params;
Expand Down
54 changes: 28 additions & 26 deletions php-fpm/Dockerfile
@@ -1,40 +1,42 @@
FROM alpine:3.4
FROM alpine:3.6

MAINTAINER Vincent Composieux <vincent.composieux@gmail.com>
LABEL maintainer="Vincent Composieux <vincent.composieux@gmail.com>"

RUN apk add --update \
php5-fpm \
php5-apcu \
php5-ctype \
php5-curl \
php5-dom \
php5-gd \
php5-iconv \
php5-imagick \
php5-json \
php5-intl \
php5-mcrypt \
php5-mysql \
php5-opcache \
php5-openssl \
php5-pdo \
php5-pdo_mysql \
php5-mysqli \
php5-xml \
php5-zlib \
php5-phar \
php7-fpm \
php7-apcu \
php7-ctype \
php7-curl \
php7-dom \
php7-gd \
php7-iconv \
php7-imagick \
php7-json \
php7-intl \
php7-mcrypt \
php7-mbstring \
php7-opcache \
php7-openssl \
php7-pdo \
php7-pdo_mysql \
php7-mysqli \
php7-xml \
php7-zlib \
php7-phar \
php7-tokenizer \
make \
curl

RUN rm -rf /var/cache/apk/* && rm -rf /tmp/*

RUN curl --insecure https://getcomposer.org/composer.phar -o /usr/bin/composer && chmod +x /usr/bin/composer

ADD symfony.ini /etc/php5/fpm/conf.d/
ADD symfony.ini /etc/php5/cli/conf.d/
ADD symfony.ini /etc/php7/php-fpm.d/
ADD symfony.ini /etc/php7/cli/conf.d/

ADD symfony.pool.conf /etc/php5/fpm.d/
ADD symfony.pool.conf /etc/php7/php-fpm.d/

CMD ["php-fpm", "-F"]
CMD ["php-fpm7", "-F"]

WORKDIR /var/www/symfony
EXPOSE 9000

0 comments on commit f47d8b5

Please sign in to comment.