From fb44df0c89bb265f8d3d5c0d76f88eac521d2053 Mon Sep 17 00:00:00 2001 From: eugenioseveri Date: Wed, 27 Sep 2023 09:46:19 +0200 Subject: [PATCH] Added Elasticsearch container port as a parameter --- .github/actions/services/action.yml | 5 ++++- .github/workflows/_python.yml | 6 ++++++ actions/services/action.yml | 5 ++++- workflows/_python.yml | 6 ++++++ 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/.github/actions/services/action.yml b/.github/actions/services/action.yml index a7c097e..aeb64e0 100644 --- a/.github/actions/services/action.yml +++ b/.github/actions/services/action.yml @@ -39,6 +39,9 @@ inputs: elasticsearch_version: description: Elasticsearch container version required: true + elasticsearch_port: + description: Elasticsearch container exposed port + required: true memcached_version: description: Memcached alpine container version required: true @@ -105,7 +108,7 @@ runs: echo " ES_JAVA_OPTS: -Xms1g -Xmx1g" >> elastic_search.yml echo " discovery.type: single-node" >> elastic_search.yml echo " ports:" >> elastic_search.yml - echo " - 59200:9200" >> elastic_search.yml + echo " - ${{ inputs.elasticsearch_port }}:9200" >> elastic_search.yml echo " healthcheck:" >> elastic_search.yml echo " test: curl -X GET 'localhost:9200/_cluster/health?wait_for_status=yellow&timeout=180s&pretty'" >> elastic_search.yml echo " interval: 10s" >> elastic_search.yml diff --git a/.github/workflows/_python.yml b/.github/workflows/_python.yml index 57b4c58..74cfa07 100644 --- a/.github/workflows/_python.yml +++ b/.github/workflows/_python.yml @@ -195,6 +195,11 @@ on: type: string required: false default: 7.10.1 + elasticsearch_port: + description: Elasticsearch container port + type: string + required: false + default: 9200 memcached_version: description: Memcached alpine container version type: string @@ -441,6 +446,7 @@ jobs: postgres_version: ${{ inputs.postgres_version }} mongo_version: ${{ inputs.mongo_version }} elasticsearch_version: ${{ inputs.elasticsearch_version }} + elasticsearch_port: ${{ inputs.elasticsearch_port }} memcached_version: ${{ inputs.memcached_version }} redis_version: ${{ inputs.redis_version }} rabbitmq_version: ${{ inputs.rabbitmq_version }} diff --git a/actions/services/action.yml b/actions/services/action.yml index a7c097e..aeb64e0 100644 --- a/actions/services/action.yml +++ b/actions/services/action.yml @@ -39,6 +39,9 @@ inputs: elasticsearch_version: description: Elasticsearch container version required: true + elasticsearch_port: + description: Elasticsearch container exposed port + required: true memcached_version: description: Memcached alpine container version required: true @@ -105,7 +108,7 @@ runs: echo " ES_JAVA_OPTS: -Xms1g -Xmx1g" >> elastic_search.yml echo " discovery.type: single-node" >> elastic_search.yml echo " ports:" >> elastic_search.yml - echo " - 59200:9200" >> elastic_search.yml + echo " - ${{ inputs.elasticsearch_port }}:9200" >> elastic_search.yml echo " healthcheck:" >> elastic_search.yml echo " test: curl -X GET 'localhost:9200/_cluster/health?wait_for_status=yellow&timeout=180s&pretty'" >> elastic_search.yml echo " interval: 10s" >> elastic_search.yml diff --git a/workflows/_python.yml b/workflows/_python.yml index 57b4c58..74cfa07 100644 --- a/workflows/_python.yml +++ b/workflows/_python.yml @@ -195,6 +195,11 @@ on: type: string required: false default: 7.10.1 + elasticsearch_port: + description: Elasticsearch container port + type: string + required: false + default: 9200 memcached_version: description: Memcached alpine container version type: string @@ -441,6 +446,7 @@ jobs: postgres_version: ${{ inputs.postgres_version }} mongo_version: ${{ inputs.mongo_version }} elasticsearch_version: ${{ inputs.elasticsearch_version }} + elasticsearch_port: ${{ inputs.elasticsearch_port }} memcached_version: ${{ inputs.memcached_version }} redis_version: ${{ inputs.redis_version }} rabbitmq_version: ${{ inputs.rabbitmq_version }}