Skip to content
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.

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

Add Docker environment checks in various API server client scripts #3

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion admin-tools/misc/getCruiseId.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

from python_sealog.settings import apiServerURL, cruisesAPIPath, headers

# FIXME: Override apiServerURL because we're outside of Docker
# FIXME: Override apiServerURL because we're outside of Docker ("fix" in progress)
apiServerURL = "https://localhost/sealog/server"


Expand All @@ -39,6 +39,11 @@

args = parser.parse_args()

# If the script is being run outside the container, use HTTP instead of HTTPS to contact API server.
if not os.path.exists('/.dockerenv'):
print("Outside Docker container environment, using HTTP API server URL.")
apiServerURL = "http://localhost/sealog/server"

r = requests.get(f'{apiServerURL}/{cruisesAPIPath}', headers=headers)

cruises = json.loads(r.text)
Expand Down