Commit e8c1e0b9 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Muestra más info en búsqueda de ficheros compose

parent 61482b8c

deployment-service/_docker-deploy.yml

+3 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ include: 
    DEPLOY_DIR_NAME: deploy

  before_script:

    - >

      # Find Compose files with known names automatically

      if [ -z ${COMPOSE_FILE} ];

      then

        firstNewComposeFile=$(echo "${NEW_COMPOSE_FILE}" | cut -d ':' -f 1);
@@ -38,6 +39,8 @@ include: 
          echo "Automatically set COMPOSE_FILE to '${composeFile}'";

          export COMPOSE_FILE="${composeFile}";

        fi;

      else

        echo "COMPOSE_FILE is defined, omitting automatic lookup";

      fi;

  script: deploy

packaging-docker/_docker-build.yml

+11 −8
Original line number Diff line number Diff line
@@ -17,10 +17,11 @@ 
    OLD_COMPOSE_FILE_NAME: docker-compose.tmpl.yml:docker-compose.dev.yml

  before_script:

    - >

      for directory in ${COMPOSE_PROJECT_DIRECTORY:-build deploy .};

      do

      # Find Compose files with known names at known paths automatically

      if [ -z ${COMPOSE_FILE_NAME} ];

      then

        for directory in ${COMPOSE_PROJECT_DIRECTORY:-build deploy .};

        do

          firstNewComposeFile=$(echo "${NEW_COMPOSE_FILE_NAME}" | cut -d ':' -f 1);

          newSingleComposeFile=compose.yaml;

          firstOldComposeFile=$(echo "${OLD_COMPOSE_FILE_NAME}" | cut -d ':' -f 1);
@@ -51,12 +52,14 @@ 
            export COMPOSE_PROJECT_DIRECTORY="${directory}";

            break;

          fi;

        fi;

        done;

        if [ -z ${COMPOSE_FILE_NAME} ];

        then

          echo "No compose file specified or detected, using docker-build default for COMPOSE_FILE_NAME";

        fi;

      else

        echo "COMPOSE_FILE_NAME is defined, omitting automatic lookup";

      fi;

  script: build



.docker-tag: