article(upgrade-docker)

Author: developer@nicolas-grevin.com

.env.dist

@@ -1,27 +1,29 @@
 # APP
-SYMFONY_APP_PATH=/
+APP_DIR=/var/www/symfony
 
-# DOCKER
-LOGS_DIR=/docker/logs
+# Symfony
+APP_ENV=dev
+APP_DEBUG=1
+SECRET=
+
+# NODE
+NODE_ENV=dev
 
 # DATABASE
+POSTGRES_HOST=
 POSTGRES_DB=
 POSTGRES_USER=
 POSTGRES_PASSWORD=
 POSTGRES_PORT=
 
-# PORT WEB
-WEB_PORT=
-ELK_PORT=
-
-# SYMFONY
-SECRET=
-
 #SMTP
 SMTP_USER=
 SMTP_PASSWORD=
 SMTP_HOST=
 SMTP_TRANSPORT=
 
+# PORT WEB
+WEB_PORT=
+
 #REDIS
 REDIS_DSN=

.gitignore

@@ -21,9 +21,6 @@
 ### PHPUnit
 /phpunit.xml
 
-### Docker
-docker/logs/
-
 ### NodeJS - NPM - YARN
 node_modules/
 npm-debug.log*

app/config/config.yml

@@ -86,8 +86,8 @@ snc_redis:
             type: predis
             logging: false
             alias: session_client
-            dsn: %redis_dsn%
-            options: %redis_options%
+            dsn: '%redis_dsn%'
+            options: '%redis_options%'
     session:
         client: session_client
         prefix: app_session_

app/config/parameters.yml

@@ -7,7 +7,7 @@ parameters:
     database_password: '%env(POSTGRES_PASSWORD)%'
 
     # Mailer parameters
-    mailer_transport: %env(SMTP_TRANSPORT)%
+    mailer_transport: '%env(SMTP_TRANSPORT)%'
     mailer_host: '%env(SMTP_HOST)%'
     mailer_user: '%env(SMTP_USER)%'
     mailer_password: '%env(SMTP_PASSWORD)%'
@@ -16,6 +16,6 @@ parameters:
     secret: '%env(SECRET)%'
 
     # Redis parameters
-    redis_dsn: '%env(REDIS_DSN)%'
+    redis_dsn: 'redis://%env(REDIS_DSN)%'
     redis_options: ~
     session_ttl: 86400

bin/app

@@ -53,10 +53,10 @@ stop ()
     docker-compose stop
 }
 
-# run bash
-bash ()
+# run sh
+sh ()
 {
-    docker-compose exec --user www-data php bash
+    docker-compose exec --user www-data php sh
 }
 
 # exec a command into app container (as root)
@@ -105,7 +105,7 @@ usage ()
     init              Initialize project
     start             Start project
     stop              Stop project
-    bash              Use bash inside the app container
+    sh                Use sh inside the app container
     exec              Executes a command inside the app container
     destroy           Remove all the project Docker containers with their volumes
     console           Use the Symfony console
@@ -123,7 +123,7 @@ main ()
         exit 0
     fi
 
-    if [[ ! $1 =~ ^init|start|stop|bash|destroy|console|composer|exec|tests$ ]]; then
+    if [[ ! $1 =~ ^init|start|stop|sh|destroy|console|composer|exec|tests$ ]]; then
         echo "$1 is not a supported command"
         exit 1
     fi

bin/console

@@ -1,48 +1,40 @@
-version: '2'
+version: '3'
 
 services:
-    postgres:
-        image: postgres:9.6
-        ports:
-            - ${POSTGRES_PORT}:5432
-        environment:
-            POSTGRES_DB: ${POSTGRES_DB}
-            POSTGRES_USER: ${POSTGRES_USER}
-            POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+  postgres:
+    image: postgres:10-alpine
+    env_file:
+      - .env
+    ports:
+      - ${POSTGRES_PORT}:5432
 
-    php:
-        build: docker/php7-fpm
-        env_file: ./.env
-        volumes:
-            - ${PWD}:/var/www/symfony
-        links:
-            - postgres
+  php:
+    build:
+      context: .
+      dockerfile: docker/php/Dockerfile
+    env_file:
+      - .env
+    user: www-data
+    working_dir: ${APP_DIR}
+    volumes:
+      - ${PWD}:${APP_DIR}
 
-    nginx:
-        build: docker/nginx
-        ports:
-            - ${WEB_PORT}:80
-        volumes_from:
-            - php
-        volumes:
-            - ${LOGS_DIR}/nginx/:/var/log/nginx
+  nginx:
+    build:
+      context: .
+      dockerfile: docker/nginx/Dockerfile
+    ports:
+      - ${WEB_PORT}:80
+    volumes:
+      - ${PWD}:${APP_DIR}
 
-    elk:
-        image: willdurand/elk
-        ports:
-            - ${ELK_PORT}:80
-        volumes:
-            - ./docker/elk/logstash:/etc/logstash
-            - ./docker/elk/logstash/patterns:/opt/logstash/patterns
-        volumes_from:
-            - php
-            - nginx
+  redis:
+    image: redis:4-alpine
 
-    redis:
-        image: redis:3.2.10
-
-    node:
-        build: docker/node
-        volumes:
-            - ${SYMFONY_APP_PATH}:/var/www/symfony
-        command: bash -c "yarn && yarn dev"
+  node:
+    image: node:9
+    user: node
+    working_dir: ${APP_DIR}
+    volumes:
+      - ${PWD}:${APP_DIR}
+    command: bash -c "yarn && yarn dev"

docker-compose.yml

@@ -1,21 +1,12 @@
-FROM debian:jessie
+FROM nginx:1.13-alpine
 
-MAINTAINER Maxence POUTORD <maxence.poutord@gmail.com>
+RUN apk --no-cache add shadow
 
-RUN apt-get update && apt-get install -y \
-    nginx
+RUN rm -f /etc/nginx/nginx.conf /etc/nginx/conf.d/*
 
-ADD nginx.conf /etc/nginx/
-ADD symfony.conf /etc/nginx/sites-available/
+ADD ./docker/nginx/nginx.conf /etc/nginx/nginx.conf
+ADD ./docker/nginx/upstream.conf /etc/nginx/conf.d/upstream.conf
+ADD ./docker/nginx/symfony.conf /etc/nginx/conf.d/symfony.conf
 
-RUN ln -s /etc/nginx/sites-available/symfony.conf /etc/nginx/sites-enabled/symfony
-RUN rm /etc/nginx/sites-enabled/default
-
-RUN echo "upstream php-upstream { server php:9000; }" > /etc/nginx/conf.d/upstream.conf
-
-RUN usermod -u 1000 www-data
-
-CMD ["nginx"]
-
-EXPOSE 80
-EXPOSE 443
+RUN addgroup -g 1000 -S www-data && \
+    adduser -u 1000 -D -S -G www-data www-data

docker/elk/logstash/logstash.conf

@@ -25,5 +25,3 @@ http {
   include /etc/nginx/sites-enabled/*;
   open_file_cache max=100;
 }
-
-daemon off;