Merge pull request #3 from culturagovbr/evolucao/ajustes-ambiente-des…

…envolvimento

Ajustes do ambiente de desenvolvimento

.gitignore

@@ -10,3 +10,5 @@ mix-manifest.json
 dev/docker-data/
 src/themes/BaseV1/assets/css/main.css
 src/themes/BaseV1/assets/css/main.css.map
+src/plugins/
+.env

dev/config.d/auth.php

@@ -1,8 +1,9 @@
 <?php
 
 return [
-    'auth.provider' => 'Fake',
-    // 'auth.provider' => '\MultipleLocalAuth\Provider',
+//    'auth.provider' => 'Fake',
+
+    'auth.provider' => '\MultipleLocalAuth\Provider',
     'auth.config' => [
         'salt' => env('AUTH_SALT', null),
         'timeout' => '24 hours',
@@ -30,7 +31,7 @@
             ],
         ]
     ]
-
+ 
     //auth.provider' => 'MapasCulturais\AuthProviders\OpauthAuthentik',
     //'auth.config' => [
     //    'salt' => env('AUTH_SALT', 'SECURITY_SALT'),

dev/config.d/plugins.php

@@ -1,7 +1,7 @@
 <?php
 
 return [
-    'plugins' => [
-        "MultipleLocalAuth"
-    ]
-];
+	'plugins' => [
+	 'MultipleLocalAuth'
+	]
+];

dev/docker-compose.yml

@@ -1,13 +1,16 @@
 version: '2'
 services:
   mapas:
+    env_file:
+      - .env
     build:
       context: ../
       dockerfile: docker/Dockerfile
     command: /var/www/dev/start.sh
     ports:
       - "80:80"
     volumes:
+      - ./.env:/.env      
       - ./docker/php.ini:/usr/local/etc/php/php.ini
       - ./docker/xdebug.ini:/usr/local/etc/php/conf.d/xdebug.ini
       # scripts principais
@@ -29,24 +32,20 @@ services:
       - ./config.d:/var/www/config/config.d
 
       - ./docker-data/assets:/var/www/html/assets
-      - ./docker-data/public-files:/var/www/html/files
-      - ./docker-data/private-files:/var/www/private-files
+      - /var/lib/docker/volumes/mapas-culturaisv7_public-files/_data:/var/www/html/files
+      - /var/lib/docker/volumes/mapas-culturaisv7_private-files/_data:/var/www/var/private-files
 
 
     links:
-      - db
       - redis
       - sessions
+#     - db
 
     environment:
-      - BUILD_ASSETS=0
+      - BUILD_ASSETS=1
       - PENDING_PCACHE_RECREATION_INTERVAL=5
       - JOBS_INTERVAL=5
       - REDIS_CACHE=redis
-      - MAILER_TRANSPORT=smtp://mailhog:1025
-      - MAILER_FROM=sysadmin@localhost
-      - NUM_PROCESSES=2
-      - MC_UPDATES_PROCESSES=4
 
       # chaves de teste do google recaptcha
       - GOOGLE_RECAPTCHA_SITEKEY=6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI
@@ -55,18 +54,14 @@ services:
       - SESSIONS_SAVE_PATH=tcp://sessions:6379
 
     depends_on:
-      - db
       - redis
       - sessions
-      - mailhog
+#     - mailhog
+#     - db
+
     stdin_open: true
     tty: true
 
-  mailhog: 
-    image: mailhog/mailhog
-    ports:
-      - "8025:8025"
-
   redis:
     image: redis:6
     command: --maxmemory 256Mb --maxmemory-policy allkeys-lru  
@@ -78,16 +73,33 @@ services:
     volumes:
       - ./docker-data/sessions:/data
 
-  db:
-    image: postgis/postgis:14-master
-    environment:
-      - POSTGRES_PASSWORD=mapas
-      - POSTGRES_USER=mapas
-      - POSTGRES_DB=mapas
-
-
-    ports:
-      - "5432:5432"
-    volumes:
-      - ./docker-data/postgres:/var/lib/postgresql/data
-      - ./db:/docker-entrypoint-initdb.d
+############################################################################################################
+# Em caso de ativar este serviço 'mailhog', lembre de definir as seguintes variaveis no arquivo '.env':    #
+#  MAIL_TRANSPORT=smtp://mailhog:1025 => seguindo o padrão 'protocolo://servidor:porta'                    #
+#  MAIL_FROM=sysadmin@localhost => este é o remetente que aparecerá nas mensagens enviadas pelo sistema e  #
+#                                   pode ser alterado conforme interesse e conveniência.                   #
+############################################################################################################
+# mailhog: # Detalhes sobre a configuração deste serviço 'MailHog' disponível em <https://hub.docker.com/r/mailhog/mailhog/>.
+#   image: mailhog/mailhog
+#   ports:
+#     - "8025:8025"
+#
+############################################################################################################
+# Em caso de ativar este serviço 'db', lembre de definir/ajustar as seguintes variaveis no arquivo '.env': #
+#  DB_HOST=servidor => nome do servidor de banco de dados                                                  #
+#  DB_NAME=nomedobanco => nome do banco de dados                                                           #
+#  DB_USER=nomedousuario => usuario de acesso ao banco de dados                                            #
+#  DB_PASS=******* => senha de acesso ao banco de dados                                                    #
+#  DB_VERSION=N => numero da verso do servidor de banco de dados                                           #
+############################################################################################################
+# db: # Detalhes sobre configuração deste serviço 'Postgres' disponível em <https://www.docker.com/blog/how-to-use-the-postgres-docker-official-image/>.
+#   image: postgis/postgis:14-master
+#   environment:
+#     - POSTGRES_PASSWORD=mapas
+#     - POSTGRES_USER=mapas
+#     - POSTGRES_DB=mapas
+#   ports:
+#     - "5432:5432"
+#   volumes:
+#     - ./docker-data/postgres:/var/lib/postgresql/data
+#     - ./db:/docker-entrypoint-initdb.d

dev/docker/php.ini

@@ -4,4 +4,6 @@ error_reportion = E_ALL ^ E_STRICT
 display_errors = On
 
 upload_max_filesize = 10M
-post_max_size = 11M
+post_max_size = 11M
+
+memory_limit = -1