Commit 9fc1edc4 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Renombra variables y corrige salida en consola

parent 17ac8f9e

_deployment.yml

+7 −7
Original line number Diff line number Diff line
@@ -21,26 +21,26 @@ 
        if [ -f ${DEPLOY_DIR_NAME}/${firstNewComposeFile} ];

        then

          echo "Detected '${firstNewComposeFile}' compose file, nice!";

          COMPOSE_FILE="${NEW_COMPOSE_FILE}";

          composeFile="${NEW_COMPOSE_FILE}";

        elif [ -f ${DEPLOY_DIR_NAME}/${newSingleComposeFile} ];

        then

          echo "Detected '${newSingleComposeFile}' compose file, nice!";

          COMPOSE_FILE="${newSingleComposeFile}";

          composeFile="${newSingleComposeFile}";

        elif [ -f ${DEPLOY_DIR_NAME}/${firstOldComposeFile} ];

        then

          echo "Detected '${firstOldComposeFile}' compose file (old naming)";

          COMPOSE_FILE="${OLD_COMPOSE_FILE}";

          composeFile="${OLD_COMPOSE_FILE}";

        elif [ -f ${DEPLOY_DIR_NAME}/${oldSingleComposeFile} ];

        then

          echo "Detected '${oldSingleComposeFile}' compose file (old naming)";

          COMPOSE_FILE="${oldSingleComposeFile}";

          composeFile="${oldSingleComposeFile}";

        else

          echo "No compose file specified or detected, using docker-deploy default for COMPOSE_FILE";

        fi;

        if [ ! -z ${COMPOSE_FILE} ];

        if [ ! -z ${composeFile} ];

        then

          echo "Automatically set COMPOSE_FILE to '${COMPOSE_FILE}'";

          export COMPOSE_FILE="${COMPOSE_FILE}";

          echo "Automatically set COMPOSE_FILE to '${composeFile}'";

          export COMPOSE_FILE="${composeFile}";

        fi;

      fi;

  script: deploy

_docker-build.yml

+8 −7
Original line number Diff line number Diff line
@@ -29,27 +29,28 @@ 
          if [ -f ${directory}/${firstNewComposeFile} ];

          then

            echo "Detected '${directory}/${firstNewComposeFile}' compose file, nice!";

            COMPOSE_FILE_NAME="${NEW_COMPOSE_FILE_NAME}";

            composeFileName="${NEW_COMPOSE_FILE_NAME}";

          elif [ -f ${directory}/${newSingleComposeFile} ];

          then

            echo "Detected '${directory}/${newSingleComposeFile}' compose file, nice!";

            COMPOSE_FILE_NAME="${newSingleComposeFile}";

            composeFileName="${newSingleComposeFile}";

          elif [ -f ${directory}/${firstOldComposeFile} ];

          then

            echo "Detected '${directory}/${firstOldComposeFile}' compose file (old naming)";

            COMPOSE_FILE_NAME="${OLD_COMPOSE_FILE_NAME}";

            composeFileName="${OLD_COMPOSE_FILE_NAME}";

          elif [ -f ${directory}/${oldSingleComposeFile} ];

          then

            echo "Detected '${directory}/${oldSingleComposeFile}' compose file (old naming)";

            COMPOSE_FILE_NAME="${oldSingleComposeFile}";

            composeFileName="${oldSingleComposeFile}";

          else

            echo "No compose file detected at '${directory}/'";

          fi;

          if [ ! -z ${COMPOSE_FILE_NAME} ];

          if [ ! -z ${composeFileName} ];

          then

            echo "Automatically set COMPOSE_FILE_NAME to '${COMPOSE_FILE_NAME}' and COMPOSE_PROJECT_DIRECTORY to '${COMPOSE_PROJECT_DIRECTORY}'";

            export COMPOSE_FILE_NAME="${COMPOSE_FILE_NAME}";

            echo "Automatically set COMPOSE_FILE_NAME to '${composeFileName}' and COMPOSE_PROJECT_DIRECTORY to '${directory}'";

            export COMPOSE_FILE_NAME="${composeFileName}";

            export COMPOSE_PROJECT_DIRECTORY="${directory}";

            break;

          fi;

        fi;

      done;