update gitlab-ci.yml

.gitlab-ci.yml

@@ -18,6 +18,8 @@ services:
 
 variables:
   CONTAINER_IMAGE: docker.infra.flowdat.com/fd3/installer
+  PMA_CONTAINER_IMAGE: docker.infra.flowdat.com/fd3/pma
+  REDIS_CONTAINER_IMAGE: docker.infra.flowdat.com/fd3/redis
   DOCKER_USER: drone
   DOCKER_PWD: 6hd2dLfL
 
@@ -69,10 +71,16 @@ installer_tag:
     - cd tools
     - composer install --no-interaction --no-progress
     - php cmd.php make:installImages ../ --client='develop' --develop=1
-    #- chmod 0600 keys/bitbucket.id_rsa ; eval $(ssh-agent); ssh-add keys/bitbucket.id_rsa ; php cmd.php make:tag:vendors repositories.ini ${CI_COMMIT_TAG} --branch=1
+    #- chmod 0600 keys/bitbucket.id_rsa ; eval $(ssh-agent); ssh-add keys/bitbucket.id_rsa ; php cmd.php make:tag:vendors repositories.ini ${CI_COMMIT_TAG}
     - chmod 0600 keys/bitbucket.id_rsa ; eval $(ssh-agent); ssh-add keys/bitbucket.id_rsa ; php cmd.php get:source ../git.ini --timeout=120
     #- chmod 0600 keys/bitbucket.id_rsa ; eval $(ssh-agent); ssh-add keys/bitbucket.id_rsa ; php cmd.php composer:require ../git.ini 'ik/*' ${CI_COMMIT_TAG} --composer_update=0
     - chmod 0600 keys/bitbucket.id_rsa ; eval $(ssh-agent); ssh-add keys/bitbucket.id_rsa ; php cmd.php make:tag:modules ../git.ini ${CI_COMMIT_TAG}
+    - docker pull $PMA_CONTAINER_IMAGE:latest || true
+    - docker tag $PMA_CONTAINER_IMAGE:latest $PMA_CONTAINER_IMAGE:${CI_COMMIT_TAG}
+    - docker push $PMA_CONTAINER_IMAGE:${CI_COMMIT_TAG}
+    - docker pull $REDIS_CONTAINER_IMAGE:latest || true
+    - docker tag $REDIS_CONTAINER_IMAGE:latest $REDIS_CONTAINER_IMAGE:${CI_COMMIT_TAG}
+    - docker push $REDIS_CONTAINER_IMAGE:${CI_COMMIT_TAG}
   only:
     refs:
       - tags

tools/src/ComposerRequireCommand.php

@@ -73,9 +73,9 @@ class ComposerRequireCommand extends Command
                     file_put_contents($composer_file, json_encode($composer_data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
                     $output->writeln('Composer update');
                     if ($dockerCompose) {
-                        $command = 'docker-compose exec ' . $sec . ' bin/composer-update.sh';
+                        $command = "docker-compose exec {$sec} bin/composer-update.sh {$packages}";
                     } else {
-                        $command = "cd {$sec} ; bash bin/composer-update.sh";
+                        $command = "cd {$sec} ; bash bin/composer-update.sh {$packages}";
                     }
                     $output->writeln("\t" . $command);
                     $resp = shell_exec($command);

tools/src/GetSource.php

@@ -52,6 +52,7 @@ class GetSource extends Command
                 $output->writeln($url . " -> " . $git_path);
                 $git->clone($url, $git_path);
             } catch (GitException $e) {
+                $output->writeln("<error>" . $e->getMessage() . "</error>");
                 $git->init($git_path);
             }
             $git->setRepository($git_path);
@@ -59,6 +60,7 @@ class GetSource extends Command
             try {
                 $git->remote->rm($input->getOption("remote-name"));
             } catch (GitException $e) {
+                $output->writeln("<error>" . $e->getMessage() . "</error>");
             }
             $git->remote->add($input->getOption("remote-name"), $url);
             try {