Commit 3656b2f3 authored by Andres Anaya Amariels's avatar Andres Anaya Amariels 🚀
Browse files

improving code

parent 6d00b752

capif/templates/ci_dev.gitlab-ci.yml

+23 −47
Original line number Diff line number Diff line
@@ -58,48 +58,24 @@ dev_linting_docker: 
    mv hadolint ../    



    # Verify the installation

    echo "### hadolint version ###"

    ../hadolint --version    



    #find . -name 'services/Dockerfile*' -exec hadolint --no-fail -f gitlab_codeclimate {} + > docker-lint.json

    # Array of service names

    SERVICES=("capif-client" "vault" "nginx" "register" "TS29222_CAPIF_Access_Control_Policy_API" "TS29222_CAPIF_API_Invoker_Management_API" 

      "TS29222_CAPIF_API_Provider_Management_API" "TS29222_CAPIF_Auditing_API" "TS29222_CAPIF_Discover_Service_API" "TS29222_CAPIF_Events_API" 

      "TS29222_CAPIF_Logging_API_Invocation_API" "TS29222_CAPIF_Publish_Service_API" "TS29222_CAPIF_Routing_Info_API" "TS29222_CAPIF_Security_API"

      "vault")



    ../hadolint services/capif-client/Dockerfile || true

    ../hadolint services/vault/Dockerfile || true

    # Loop over service names

    for SERVICE in "${SERVICES[@]}"; do

      echo "### $SERVICE ###"

      

    echo "### nginx ###"

    ../hadolint services/nginx/Dockerfile || true

      # Run hadolint on Dockerfile

      ../hadolint services/$SERVICE/Dockerfile || true

      

    echo "### register ###"

    ../hadolint services/register/Dockerfile || true



    echo "### TS29222_CAPIF_Access_Control_Policy_API ###"

    ../hadolint services/TS29222_CAPIF_Access_Control_Policy_API/Dockerfile || true



    echo "### TS29222_CAPIF_API_Invoker_Management_API ###"

    ../hadolint services/TS29222_CAPIF_API_Invoker_Management_API/Dockerfile || true



    echo "### TS29222_CAPIF_API_Provider_Management_API ###"

    ../hadolint services/TS29222_CAPIF_API_Provider_Management_API/Dockerfile || true



    echo "### TS29222_CAPIF_Auditing_API ###"

    ../hadolint services/TS29222_CAPIF_Auditing_API/Dockerfile || true



    echo "### TS29222_CAPIF_Discover_Service_API ###"

    ../hadolint services/TS29222_CAPIF_Discover_Service_API/Dockerfile || true



    echo "### TS29222_CAPIF_Events_API ###"

    ../hadolint services/TS29222_CAPIF_Events_API/Dockerfile || true



    echo "### TS29222_CAPIF_Logging_API_Invocation_API ###"

    ../hadolint services/TS29222_CAPIF_Logging_API_Invocation_API/Dockerfile || true



    echo "### TS29222_CAPIF_Publish_Service_API ###"

    ../hadolint services/TS29222_CAPIF_Publish_Service_API/Dockerfile || true



    echo "### TS29222_CAPIF_Routing_Info_API ###"

    ../hadolint services/TS29222_CAPIF_Routing_Info_API/Dockerfile || true



    echo "### TS29222_CAPIF_Security_API ###"

    ../hadolint services/TS29222_CAPIF_Security_API/Dockerfile || true

      echo "----------------------------------------------------"

    done

#  artifacts:

#    name: "$CI_JOB_NAME artifacts from $CI_PROJECT_NAME on $CI_COMMIT_REF_SLUG"

#    when: always

capif/templates/ci_staging.gitlab-ci.yml

+27 −47
Original line number Diff line number Diff line
@@ -63,48 +63,25 @@ staging_linting_docker: 
    mv hadolint ../    



    # Verify the installation

    echo "### hadolint version ###"

    ../hadolint --version    



    #find . -name 'services/Dockerfile*' -exec hadolint --no-fail -f gitlab_codeclimate {} + > docker-lint.json

    # Array of service names

    SERVICES=("capif-client" "vault" "nginx" "register" "TS29222_CAPIF_Access_Control_Policy_API" "TS29222_CAPIF_API_Invoker_Management_API" 

      "TS29222_CAPIF_API_Provider_Management_API" "TS29222_CAPIF_Auditing_API" "TS29222_CAPIF_Discover_Service_API" "TS29222_CAPIF_Events_API" 

      "TS29222_CAPIF_Logging_API_Invocation_API" "TS29222_CAPIF_Publish_Service_API" "TS29222_CAPIF_Routing_Info_API" "TS29222_CAPIF_Security_API"

      "vault")



    ../hadolint services/capif-client/Dockerfile || true

    ../hadolint services/vault/Dockerfile || true

    # Loop over service names

    for SERVICE in "${SERVICES[@]}"; do

      echo "### $SERVICE ###"

      

    echo "### nginx ###"

    ../hadolint services/nginx/Dockerfile || true

      # Run hadolint on Dockerfile

      ../hadolint services/$SERVICE/Dockerfile || true

      

    echo "### register ###"

    ../hadolint services/register/Dockerfile || true



    echo "### TS29222_CAPIF_Access_Control_Policy_API ###"

    ../hadolint services/TS29222_CAPIF_Access_Control_Policy_API/Dockerfile || true



    echo "### TS29222_CAPIF_API_Invoker_Management_API ###"

    ../hadolint services/TS29222_CAPIF_API_Invoker_Management_API/Dockerfile || true



    echo "### TS29222_CAPIF_API_Provider_Management_API ###"

    ../hadolint services/TS29222_CAPIF_API_Provider_Management_API/Dockerfile || true



    echo "### TS29222_CAPIF_Auditing_API ###"

    ../hadolint services/TS29222_CAPIF_Auditing_API/Dockerfile || true



    echo "### TS29222_CAPIF_Discover_Service_API ###"

    ../hadolint services/TS29222_CAPIF_Discover_Service_API/Dockerfile || true



    echo "### TS29222_CAPIF_Events_API ###"

    ../hadolint services/TS29222_CAPIF_Events_API/Dockerfile || true



    echo "### TS29222_CAPIF_Logging_API_Invocation_API ###"

    ../hadolint services/TS29222_CAPIF_Logging_API_Invocation_API/Dockerfile || true



    echo "### TS29222_CAPIF_Publish_Service_API ###"

    ../hadolint services/TS29222_CAPIF_Publish_Service_API/Dockerfile || true



    echo "### TS29222_CAPIF_Routing_Info_API ###"

    ../hadolint services/TS29222_CAPIF_Routing_Info_API/Dockerfile || true

      echo "----------------------------------------------------"

    done



    echo "### TS29222_CAPIF_Security_API ###"

    ../hadolint services/TS29222_CAPIF_Security_API/Dockerfile || true

#  artifacts:

#    name: "$CI_JOB_NAME artifacts from $CI_PROJECT_NAME on $CI_COMMIT_REF_SLUG"

#    when: always
@@ -142,7 +119,10 @@ staging_cvs: 
    echo "TMP_PWD=$TMP_PWD"

    

    # Array of image names

    IMAGE_NAMES=("capif-client" "nginx" "register")

    IMAGE_NAMES=("capif-client" "nginx" "register" "TS29222_CAPIF_Access_Control_Policy_API" "TS29222_CAPIF_API_Invoker_Management_API"

      "TS29222_CAPIF_API_Provider_Management_API" "TS29222_CAPIF_Auditing_API" "TS29222_CAPIF_Discover_Service_API"

      "TS29222_CAPIF_Events_API" "TS29222_CAPIF_Logging_API_Invocation_API" "TS29222_CAPIF_Publish_Service_API"

      "TS29222_CAPIF_Routing_Info_API" "TS29222_CAPIF_Security_API" "vault")

    

    # Loop over image names

    for IMAGE_NAME in "${IMAGE_NAMES[@]}"; do