Forráskód Böngészése

Bugs

Add scripts for composer-update.sh
gabriel 6 éve
szülő
commit
52b3327d42

+ 18 - 0
tools/composer-update.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+start=`date +%s`
+
+chmod 0400 keys/*
+eval $(ssh-agent)
+ssh-add keys/bitbucket.id_rsa
+
+command="composer update --prefer-dist --no-plugins --no-autoloader --no-scripts --no-progress --no-suggest --with-dependencies --ignore-platform-reqs --prefer-lowest -n $@"
+echo -e "Command: \e[42m$command\e[0m"
+$command
+
+kill $SSH_AGENT_PID
+unset SSH_AGENT_PID
+
+end=`date +%s`
+runtime=$((end-start))
+echo -e "\e[42mExecution time: $runtime s\e[0m"

+ 1 - 1
tools/src/Release.php

@@ -471,7 +471,7 @@ class Release extends Command
         $composer = new FileFormat("../", 3);
         $this->registerVolumes($composer);
         $nc = new NetworkConfig();
-        $nc->addDriver()->addSubnetGateway("172.172.172.0/24", "172.172.172.1");
+        $nc->addDriver()->addSubnetGateway("172.172.172.0/24");
         $composer->getNetwork()->addDriver($this->_network_name)->addConfig($this->_network_name, $nc);
 
         $base_vars = array(

+ 1 - 1
tools/src/Services/Geoserver.php

@@ -50,7 +50,7 @@ class Geoserver extends InitialService
                 ->addVolumes("./extra/geoserver/geoserver-data/styles", "/opt/geoserver/data_dir/styles")
                 ->addVolumes("./geoserver/geoserver-shapes", "/var/www/shapes")
                 ->addPorts(8081, 8080)
-                ->mem_limit('500m')
+                ->setReservationMemory('500m')
                 ->network($this->getRelease()->_network_name)->ipv4_address($this->generateIP($this->ip_server));
         }
 

+ 2 - 1
tools/src/Services/Mongodb.php

@@ -43,7 +43,8 @@ class Mongodb extends InitialService
                 ->image("mongo:" . $version)
                 ->addVolumes("./mongodb", "/data/db")
                 ->addVolumes("./extra/statsd/statsd/backend/mongodb/scripts", "/scripts")
-                ->mem_limit('10g')
+                ->setReservationMemory('10g')
+                ->setReservationCPU("0.2")
                 ->network($this->getRelease()->_network_name)->ipv4_address($this->generateIP($this->ip_server));
         }
     }