Skip to content

Feature/fix maven and redis and okta checks #456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
duckhead wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

Feature/fix maven and redis and okta checks #456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f9c1ff2
Prevent Redis from downloading the GeoIP database it does by default.…
duckhead Sep 29, 2023
75988c0
Maven 3.8.6 is no longer available. Use version 3.8.8 instead.
duckhead Sep 29, 2023
acaecb0
Remove XXX with xxx so our osmt_cli.sh -v checks will detect that it'…
duckhead Sep 29, 2023
473d899
Get rid of the parsing of the patch level of the docker minor version…
duckhead Oct 3, 2023
0f07671
Add in OKTA variable debugging, but leave it commented out for now.
duckhead Oct 3, 2023
900ad76
Revert changes until we figure out the breakage.
duckhead Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions bin/lib/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}") || \
Expand Down
2 changes: 1 addition & 1 deletion docker/base-images/Dockerfile.osmt-build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}

Expand Down
1 change: 1 addition & 0 deletions docker/dev-stack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions test/bin/pre_test_setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions test/osmt-apitest.env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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