Commit a9cfe106 authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'dev' into 'master' 

Dev

See merge request redmic-project/server/user!18
parents 740828c7 efb24260

.gitlab-ci.yml

+9 −8
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ stages: 
    - >

      mkdir -p sql;

      chmod -R 755 sql;

      docker network create test;

      docker network create test

    - >

      docker run -d --rm --name postgres \

        -p 5432:5432 \
@@ -52,7 +52,7 @@ stages: 
        -e POSTGRES_USER \

        -e POSTGRES_PASSWORD \

        -v $(pwd)/sql:/sql \

        postgres:${POSTGRES_IMAGE_TAG};

        postgres:${POSTGRES_IMAGE_TAG}

    - >

      curl -s --header "PRIVATE-TOKEN: ${GITLAB_TOKEN_READ_API}" \

        -o sql/oauth_database_structure_test.sql \
@@ -65,16 +65,16 @@ stages: 
        "https://gitlab.com/api/v4/snippets/${USER_DATABASE_STRUCTURE_TEST_SNIPPET_ID}/raw";

      curl -s --header "PRIVATE-TOKEN: ${GITLAB_TOKEN_READ_API}" \

        -o sql/user_database_data_test.sql \

        "https://gitlab.com/api/v4/snippets/${USER_DATABASE_DATA_TEST_SNIPPET_ID}/raw";

        "https://gitlab.com/api/v4/snippets/${USER_DATABASE_DATA_TEST_SNIPPET_ID}/raw"

    - >

      RETRIES=10;

      until docker exec postgres psql -h localhost \

          -d redmic \

          -U ${POSTGRES_USER} \

          -c 'select 1' > /dev/null 2>&1 || [ $RETRIES -eq 0 ];

      do \

          RETRIES=$((RETRIES-=1)) \

          echo "Waiting for postgres server, ${RETRIES} remaining attempts..." \

      do

          RETRIES=$((RETRIES-=1));

          echo "Waiting for postgres server, ${RETRIES} remaining attempts...";

          sleep 1;

      done;

      docker exec postgres psql -h localhost \
@@ -96,7 +96,7 @@ stages: 
      docker exec postgres psql -h localhost \

        -d redmic \

        -U ${POSTGRES_USER} \

        -f /sql/user_database_data_test.sql;

        -f /sql/user_database_data_test.sql

    - >

      docker run -d --rm --name oauth \

        -p 8081:8081 \
@@ -104,8 +104,9 @@ stages: 
        -e SPRING_PROFILES_ACTIVE=dev \

        -e SPRING_DATASOURCE_USERNAME \

        -e SPRING_DATASOURCE_PASSWORD \

        ${OAUTH_IMAGE_NAME}:${OAUTH_IMAGE_TAG};

        ${OAUTH_IMAGE_NAME}:${OAUTH_IMAGE_TAG}

  after_script:

    - rm -rf .m2/repository/es

    - docker stop oauth postgres



.docker-build:

deploy/docker-compose.dev.yml

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ services: 
      resources:

        limits:

          cpus: '${RESOURCES_LIMITS_CPUS:-0.5}'

          memory: ${RESOURCES_LIMITS_MEMORY:-512M}

          memory: ${RESOURCES_LIMITS_MEMORY:-1G}

        reservations:

          cpus: '${RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-410M}
 
          memory: ${RESOURCES_RESERVATIONS_MEMORY:-600M}