Merge pull request #18 from aakb/feature/ITSTYR-78_cleanup

Feature/itstyr 78 cleanup

Author: turegjorup

.env.dist .env.env.dist renamed to .env

@@ -2,6 +2,11 @@
 # Copy this file to .env file for development, create environment variables when deploying to production
 # https://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration
 
+###> aakb/itkdev-docker configuration ###
+COMPOSE_PROJECT_NAME=itstyr
+COMPOSE_DOMAIN=itstyr.local.itkdev.dk
+###< aakb/itkdev-docker configuration ###
+
 ###> symfony/framework-bundle ###
 APP_ENV=dev
 APP_SECRET=ef328b855abd10c26ed43a768edcb8e7

.gitignore

@@ -1,6 +1,5 @@
 
 ###> symfony/framework-bundle ###
-/.env
 /public/bundles/
 /var/
 /vendor/

README.md

@@ -3,8 +3,6 @@ Styringsværktøj til IT projekter
 
 ## Setup locally
 
-Copy `.env.dist` to `.env`.
-
 ### Start Docker containers
 
 ```sh
@@ -21,48 +19,12 @@ docker-compose exec phpfpm bin/console fos:user:create --super-admin
 
 ### Access the site
 
-You can get the site url by running:
-
-```sh
-echo http://itstyr.docker.localhost:$(docker-compose port reverse-proxy 80 | cut -d: -f2)
-```
-
-Open it in your default browser by running:
-
-```sh
-open http://itstyr.docker.localhost:$(docker-compose port reverse-proxy 80 | cut -d: -f2)
-```
-
-Note: You may have to add the line
-
-```
-0.0.0.0	itstyr.docker.localhost
-```
-
-to your `hosts` file to access the site.
-
-## Debugging
+You should now be able to browse to the application
 
-To enable debugging in the `phpfpm` container, you have to restart it and enable `xdebug`:
-
-```sh
-PHP_XDEBUG=1 \
-PHP_XDEBUG_REMOTE_AUTOSTART=1 \
-PHP_XDEBUG_REMOTE_HOST=$(ipconfig getifaddr en0) \
-PHP_XDEBUG_REMOTE_PORT=9000 \
-PHP_XDEBUG_REMOTE_CONNECT_BACK=0 \
-docker-compose up -d
 ```
-
-To disable `xdebug`, restart the container:
-
-```sh
-docker-compose up -d
+open http://$(docker-compose port nginx 80)
 ```
 
-## Setup on server
-https://symfony.com/doc/current/setup/web_server_configuration.html
-
 ## Import systems and reports
 ```sh
 bin/console itstyr:import:system PATH

composer.json

@@ -1,8 +1,10 @@
 {
+    "name": "aakb/itstyr",
+    "description": "",
     "type": "project",
     "license": "proprietary",
     "require": {
-        "php": "^7.1.3",
+        "php": "^7.4",
         "ext-iconv": "*",
         "doctrine/doctrine-migrations-bundle": "^1.3",
         "easycorp/easyadmin-bundle": "^2.3",

config/packages/doctrine.yaml

@@ -32,6 +32,6 @@ doctrine:
             gedmo_loggable:
                 type: annotation
                 prefix: Gedmo\Loggable\Entity
-                dir: "%kernel.root_dir%/../vendor/gedmo/doctrine-extensions/lib/Gedmo/Loggable/Entity"
+                dir: "%kernel.project_dir%/vendor/gedmo/doctrine-extensions/src/Loggable/Entity"
                 alias: GedmoLoggable # (optional) it will default to the name set for the mapping
                 is_bundle: false

docker-compose.server.yml

@@ -0,0 +1,46 @@
+version: "3"
+
+networks:
+  frontend:
+    external: true
+  app:
+    driver: bridge
+    internal: true
+    external: false
+
+services:
+  phpfpm:
+    image: itkdev/php7.4-fpm:alpine
+    restart: unless-stopped
+    networks:
+      - app
+    environment:
+      - PHP_MAX_EXECUTION_TIME=30
+      - PHP_MEMORY_LIMIT=128M
+    volumes:
+      - .:/app:delegated
+      - drush-cache:/root/.drush
+
+  nginx:
+    image: nginx:stable-alpine
+    restart: unless-stopped
+    networks:
+      - app
+      - frontend
+    depends_on:
+      - phpfpm
+    ports:
+      - '80'
+    volumes:
+      - ${PWD}/.docker/vhost.conf:/etc/nginx/conf.d/default.conf:ro
+      - ./:/app:rw
+    labels:
+      - "traefik.enable=true"
+      - "traefik.docker.network=frontend"
+      - "traefik.http.routers.${COMPOSE_PROJECT_NAME}.rule=Host(`${COMPOSE_SERVER_DOMAIN}`)"
+      - "traefik.http.routers.${COMPOSE_PROJECT_NAME}.entrypoints=websecure"
+      #- "traefik.http.routers.${COMPOSE_PROJECT_NAME}.middlewares=ITKBasicAuth@file"
+
+# Drush cache volume to persist cache between runs.
+volumes:
+  drush-cache:

docker-compose.yml

@@ -1,35 +1,48 @@
 version: "3"
 
+networks:
+  frontend:
+    external: true
+  app:
+    driver: bridge
+    internal: false
+
 services:
   mariadb:
-    image: mariadb:10.3
+    image: itkdev/mariadb:latest
+    networks:
+      - app
     ports:
       - '3306'
     environment:
-      MYSQL_ROOT_PASSWORD: password
-      MYSQL_USER: db
-      MYSQL_PASSWORD: db
-      MYSQL_DATABASE: db
-    # @see https://symfony.com/doc/current/setup/symfony_server.html#docker-integration
-    labels:
-      com.symfony.server.service-prefix: 'DATABASE'
+      - MYSQL_ROOT_PASSWORD=password
+      - MYSQL_USER=db
+      - MYSQL_PASSWORD=db
+      - MYSQL_DATABASE=db
+      #- ENCRYPT=1 # Uncomment to enable database encryption.
 
   phpfpm:
     image: itkdev/php7.4-fpm:latest
-    restart: always
+    networks:
+      - app
     environment:
-      - PHP_XDEBUG=${PHP_XDEBUG:-0}
-      - PHP_XDEBUG_REMOTE_AUTOSTART=${PHP_XDEBUG_REMOTE_AUTOSTART:-0}
-      - PHP_XDEBUG_REMOTE_HOST=${PHP_XDEBUG_REMOTE_HOST:-0.0.0.0}
-      - PHP_XDEBUG_REMOTE_CONNECT_BACK=${PHP_XDEBUG_REMOTE_CONNECT_BACK:-0}
-      # - PHP_MAIL=1 # Uncomment to enable mailhog
+      - XDEBUG_MODE=${XDEBUG_MODE:-off}
+      - XDEBUG_SESSION=${XDEBUG_SESSION:-0}
+      - PHP_MAX_EXECUTION_TIME=30
+      - PHP_MEMORY_LIMIT=256M
+      # - PHP_MAIL=1 # Uncomment to enable mailhog.
+      - DOCKER_HOST_DOMAIN=${COMPOSE_DOMAIN}
+      - COMPOSER_VERSION=1
     depends_on:
       - mariadb
     volumes:
       - .:/app:delegated
 
   nginx:
     image: nginx:latest
+    networks:
+      - app
+      - frontend
     depends_on:
       - phpfpm
     ports:
@@ -38,27 +51,14 @@ services:
       - ${PWD}/.docker/vhost.conf:/etc/nginx/conf.d/default.conf:ro
       - ./:/app:delegated
     labels:
-      - "traefik.frontend.rule=Host:${COMPOSE_PROJECT_NAME}.docker.localhost"
-
-  memcached:
-    image: 'memcached:latest'
-    ports:
-      - '11211'
-    environment:
-      - MEMCACHED_CACHE_SIZE=64
+      - "traefik.enable=true"
+      - "traefik.docker.network=frontend"
+      - "traefik.http.routers.${COMPOSE_PROJECT_NAME}.rule=Host(`${COMPOSE_DOMAIN}`)"
 
   mailhog:
     image: mailhog/mailhog
-    restart: always
+    networks:
+      - app
     ports:
       - "1025"
       - "8025"
-
-  reverse-proxy:
-    image: traefik  # The official Traefik docker image
-    command: --api --docker  # Enables the web UI and tells Traefik to listen to docker
-    ports:
-      - "80"
-      - "8080"
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock  # So that Traefik can listen to the Docker events