diff --git a/bin/lib/common.sh b/bin/lib/common.sh index f88e929a3..483e3d1b9 100755 --- a/bin/lib/common.sh +++ b/bin/lib/common.sh @@ -247,8 +247,6 @@ _validate_docker_version() { echo_debug "3 - ${tmp_minor}" det_docker_minor="${tmp_minor%.*}" echo_debug "4 - ${det_docker_minor}" - det_docker_patch="${det_docker_version##*.}" - echo_debug "5 - ${det_docker_patch}" if [[ "${det_docker_major}" -gt "${req_docker_major}" || \ ("${det_docker_major}" -eq "${req_docker_major}" && "${det_docker_minor}" -ge "${req_docker_minor}") || \ diff --git a/docker/base-images/Dockerfile.osmt-build b/docker/base-images/Dockerfile.osmt-build index ff5556a54..b54191815 100644 --- a/docker/base-images/Dockerfile.osmt-build +++ b/docker/base-images/Dockerfile.osmt-build @@ -1,6 +1,6 @@ FROM wguopensource/osmt-base:latest as osmt-build -ENV M2_VERSION=3.8.6 +ENV M2_VERSION=3.8.8 ENV M2_HOME=/usr/local/maven ENV PATH=${M2_HOME}/bin:${PATH} diff --git a/docker/dev-stack.yml b/docker/dev-stack.yml index 02c942f47..4ad8164ea 100644 --- a/docker/dev-stack.yml +++ b/docker/dev-stack.yml @@ -25,6 +25,7 @@ services: - "discovery.type=single-node" - "net=host" - "xpack.security.enabled=false" + - "ingest.geoip.downloader.enabled=false" ports: - "${ELASTICSEARCH_HTTP_PORT:-9200}:9200" - "${ELASTICSEARCH_TRANSPORT_PORT:-9300}:9300" diff --git a/test/bin/pre_test_setup.sh b/test/bin/pre_test_setup.sh index 3c3651695..05bfa079a 100755 --- a/test/bin/pre_test_setup.sh +++ b/test/bin/pre_test_setup.sh @@ -37,6 +37,7 @@ error_handler() { main() { # Sourcing API test env file + #echo OKTA variables are: ${OKTA_URL} ${OKTA_USERNAME} ${OKTA_PASSWORD} source_env_file_unless_provided_okta "${PROJECT_DIR}/test/osmt-apitest.env" source_env_file "${PROJECT_DIR}/test/bin/osmt-apitest.rc" diff --git a/test/osmt-apitest.env.example b/test/osmt-apitest.env.example index b109e3038..2d05f3cfd 100644 --- a/test/osmt-apitest.env.example +++ b/test/osmt-apitest.env.example @@ -3,5 +3,5 @@ # Provide your Okta endpoint and credentials here. This will be used to get a Bearer token for the API tests OKTA_URL=https://dev-XXXXXXXX.okta.com -OKTA_USERNAME=XXX.XXX@example.com -OKTA_PASSWORD=XXX +OKTA_USERNAME=XXXXXX@example.com +OKTA_PASSWORD=XXXXXX