فهرست منبع

Se agrega librerípara convertir geojson a shapes. Se actualiza el verndor geoserver-bundle. Se actualizan los parÃmetros docker de geoserver.

Maxi Schvindt 7 سال پیش
والد
کامیت
9d78aa72df
4فایلهای تغییر یافته به همراه35 افزوده شده و 32 حذف شده
  1. 4 1
      Dockerfile
  2. 4 4
      app/config/parameters.yml.dist
  3. 4 4
      app/config/parameters.yml.docker
  4. 23 23
      composer.lock

+ 4 - 1
Dockerfile

@@ -26,9 +26,12 @@ RUN cp app/config/parameters.yml.docker app/config/parameters.yml ;\
     cp app/config/bundles/hwi/oauth-bundle/parameters.yml.docker app/config/bundles/hwi/oauth-bundle/parameters.yml ;\
     cp app/config/bundles/ik/webservice-bundle/parameters.yml.docker app/config/bundles/ik/webservice-bundle/parameters.yml ;\
     cp app/config/bundles/ik/base-admin-bundle/parameters.yml.dist app/config/bundles/ik/base-admin-bundle/parameters.yml 
- 
+
+RUN apt-get install gdal-bin -yq
+
 CMD  eval $(ssh-agent) ; ssh-add /opt/keys/bitbucket.id_rsa ; composer install --no-scripts --no-interaction ;\
      rm var/cache/* -rf ;\
      composer dump-autoload ;\
      composer run-script post-install-cmd --no-interaction ;\
      bin/console server:run 0.0.0.0
+     

+ 4 - 4
app/config/parameters.yml.dist

@@ -28,13 +28,13 @@ parameters:
     db_session_name: fd_session
     db_session_user: root
     db_session_password: null
-    app_path: '/var/flowdat/stats'
+    app_path: '/opt/stats'
     geoserver_service: true
-    geoserver_host: 127.0.0.1
-    geoserver_port: 8080
+    geoserver_host: '%env(HOST_GEOSERVER)%'
+    geoserver_port: 8082
     geoserver_user: admin
     geoserver_pass: geoserver
-    geoserver_path_shapes: '/var/flowdat/geoserver-shapes'
+    geoserver_path_shapes: '/var/www/shapes'
     device_server_base: 1
     # Url del webservice de crontab para crear los archivos
     url_crontab: http://127.0.0.1/cron.php?wsdl

+ 4 - 4
app/config/parameters.yml.docker

@@ -35,13 +35,13 @@ parameters:
     db_session_name: fd_session
     db_session_user: root
     db_session_password: 235r2342gtfsw
-    app_path: '/var/flowdat/stats'
+    app_path: '/opt/stats'
     geoserver_service: true
-    geoserver_host: 127.0.0.1
-    geoserver_port: 8080
+    geoserver_host: '%env(HOST_GEOSERVER)%'
+    geoserver_port: 8082
     geoserver_user: admin
     geoserver_pass: geoserver
-    geoserver_path_shapes: '/var/flowdat/geoserver-shapes'
+    geoserver_path_shapes: '/var/www/shapes'
     device_server_base: 1
     url_crontab: http://supervisord/cron.php?wsdl
     env(HOST_BASE): base

+ 23 - 23
composer.lock

@@ -1386,7 +1386,7 @@
                 "audit",
                 "bundle"
             ],
-            "time": "2017-06-27 13:16:34"
+            "time": "2017-06-27T13:16:34+00:00"
         },
         {
             "name": "ik/auth-bundle",
@@ -1409,7 +1409,7 @@
                 "auth",
                 "bundle"
             ],
-            "time": "2017-09-22 13:27:29"
+            "time": "2017-09-22T13:27:29+00:00"
         },
         {
             "name": "ik/base-admin-bundle",
@@ -1432,7 +1432,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-11-22 15:29:25"
+            "time": "2017-11-22T15:29:25+00:00"
         },
         {
             "name": "ik/device-bundle",
@@ -1455,7 +1455,7 @@
                 "bundle",
                 "validators"
             ],
-            "time": "2017-10-27 15:31:53"
+            "time": "2017-10-27T15:31:53+00:00"
         },
         {
             "name": "ik/extra-data-bundle",
@@ -1478,7 +1478,7 @@
                 "bundle",
                 "extra-data"
             ],
-            "time": "2017-11-17 18:25:46"
+            "time": "2017-11-17T18:25:46+00:00"
         },
         {
             "name": "ik/leaflet-bundle",
@@ -1499,7 +1499,7 @@
                 }
             },
             "description": "The Flowdat3 Leaflet Resource",
-            "time": "2017-10-18 17:36:55"
+            "time": "2017-10-18T17:36:55+00:00"
         },
         {
             "name": "ik/migrations-bundle",
@@ -1522,7 +1522,7 @@
                 "bundle",
                 "migrations"
             ],
-            "time": "2017-08-31 11:49:28"
+            "time": "2017-08-31T11:49:28+00:00"
         },
         {
             "name": "ik/oauthclient-bundle",
@@ -1549,7 +1549,7 @@
                 "bundle",
                 "oauth"
             ],
-            "time": "2017-10-11 14:15:38"
+            "time": "2017-10-11T14:15:38+00:00"
         },
         {
             "name": "ik/owner-voter-bundle",
@@ -1572,7 +1572,7 @@
                 "bundle",
                 "owner-voter"
             ],
-            "time": "2017-06-12 15:49:24"
+            "time": "2017-06-12T15:49:24+00:00"
         },
         {
             "name": "ik/redis-bundle",
@@ -1596,7 +1596,7 @@
                 "php-redis-service",
                 "redis"
             ],
-            "time": "2017-11-16 13:08:02"
+            "time": "2017-11-16T13:08:02+00:00"
         },
         {
             "name": "ik/stats/base-stats-bundle",
@@ -1617,7 +1617,7 @@
                 "BaseStatsBundle",
                 "Flowdat 3"
             ],
-            "time": "2017-11-22 12:31:48"
+            "time": "2017-11-22T12:31:48+00:00"
         },
         {
             "name": "ik/stats/fiberhome-bundle",
@@ -1638,7 +1638,7 @@
                 "Fiberhome",
                 "Flowdat 3"
             ],
-            "time": "2017-11-22 12:33:33"
+            "time": "2017-11-22T12:33:33+00:00"
         },
         {
             "name": "ik/stats/fiberlink-bundle",
@@ -1659,7 +1659,7 @@
                 "Fiberlink",
                 "Flowdat 3"
             ],
-            "time": "2017-11-22 12:32:28"
+            "time": "2017-11-22T12:32:28+00:00"
         },
         {
             "name": "ik/stats/geoserver-bundle",
@@ -1667,7 +1667,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/GeoserverBundle.git",
-                "reference": "fd2e7e9d44dc2debc2ab6773cd1f7d4e77633d5e"
+                "reference": "fa020e7fb9af94ef0716a71fb9c7cc2b8b0db359"
             },
             "type": "library",
             "autoload": {
@@ -1680,7 +1680,7 @@
                 "Flowdat 3",
                 "Geoserver"
             ],
-            "time": "2017-08-29 15:11:22"
+            "time": "2017-12-05T13:47:49+00:00"
         },
         {
             "name": "ik/stats/huawei-bundle",
@@ -1701,7 +1701,7 @@
                 "Flowdat 3",
                 "Huawei"
             ],
-            "time": "2017-11-22 12:33:56"
+            "time": "2017-11-22T12:33:56+00:00"
         },
         {
             "name": "ik/stats/zte-bundle",
@@ -1722,7 +1722,7 @@
                 "Flowdat 3",
                 "Zte"
             ],
-            "time": "2017-11-24 14:05:31"
+            "time": "2017-11-24T14:05:31+00:00"
         },
         {
             "name": "ik/statsd-bundle",
@@ -1743,7 +1743,7 @@
                 "stats",
                 "statsd"
             ],
-            "time": "2017-11-17 13:12:02"
+            "time": "2017-11-17T13:12:02+00:00"
         },
         {
             "name": "ik/webservice-bundle",
@@ -1764,7 +1764,7 @@
                 }
             },
             "description": "The Flowdat3 Webservice Rest",
-            "time": "2017-11-14 12:49:51"
+            "time": "2017-11-14T12:49:51+00:00"
         },
         {
             "name": "ik/workflow-bundle",
@@ -1802,7 +1802,7 @@
                 "bundle",
                 "workflow"
             ],
-            "time": "2017-11-09 15:34:00"
+            "time": "2017-11-09T15:34:00+00:00"
         },
         {
             "name": "incenteev/composer-parameter-handler",
@@ -2560,7 +2560,7 @@
                 "oss_snmp",
                 "snmp"
             ],
-            "time": "2017-10-31 14:22:45"
+            "time": "2017-10-31T14:22:45+00:00"
         },
         {
             "name": "paragonie/random_compat",
@@ -3452,7 +3452,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-10-04 12:16:04"
+            "time": "2017-10-04T12:16:04+00:00"
         },
         {
             "name": "sonata-project/block-bundle",
@@ -4880,7 +4880,7 @@
                 }
             ],
             "description": "REST API Generator for Symfony 2",
-            "time": "2016-04-18 12:29:38"
+            "time": "2016-04-18T12:29:38+00:00"
         },
         {
             "name": "willdurand/jsonp-callback-validator",