Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
workspaces
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ssa
workspaces
Commits
e857561b
Commit
e857561b
authored
3 years ago
by
Charlotte Hausman
Browse files
Options
Downloads
Patches
Plain Diff
make ingest envoy use full capability service url to avoid REST errors
parent
f966db87
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!693
make ingest envoy use full capability service url to avoid REST errors
Pipeline
#3823
passed
3 years ago
Stage: push-base
Stage: cache-build
Stage: build
Stage: unit-test
Stage: test-coverage
Stage: push
Stage: deploy-coverage-page
Stage: generate-yaml
Stage: trigger
Stage: deploy
Stage: e2e-test
Stage: .post
Pipeline: workspaces
#3824
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
apps/cli/executables/pexable/ingest_envoy/ingest_envoy/ingest.py
+1
-1
1 addition, 1 deletion
...i/executables/pexable/ingest_envoy/ingest_envoy/ingest.py
docker.properties
+2
-0
2 additions, 0 deletions
docker.properties
with
3 additions
and
1 deletion
apps/cli/executables/pexable/ingest_envoy/ingest_envoy/ingest.py
+
1
−
1
View file @
e857561b
...
...
@@ -35,7 +35,7 @@ logger.addHandler(logging.StreamHandler(sys.stdout))
def
_get_settings
(
filename
:
str
,
arg_type
:
str
)
->
dict
:
ingestion_settings
=
CapoConfig
().
settings
(
"
edu.nrao.workspaces.IngestionSettings
"
)
capability_url
=
CapoConfig
().
settings
(
"
edu.nrao.workspaces.CapabilitySettings
"
).
s
erviceUrl
capability_url
=
CapoConfig
().
settings
(
"
edu.nrao.workspaces.CapabilitySettings
"
).
externalS
erviceUrl
workflow_url
=
CapoConfig
().
settings
(
"
edu.nrao.workspaces.WorkflowSettings
"
).
serviceUrl
staging_root_dir
=
ingestion_settings
.
stagingDirectory
storage_root_dir
=
ingestion_settings
.
storageDirectory
...
...
This diff is collapsed.
Click to expand it.
docker.properties
+
2
−
0
View file @
e857561b
...
...
@@ -17,6 +17,8 @@ edu.nrao.workspaces.WorkflowSettings.serviceUrl = http://workflow:3456
edu.nrao.workspaces.NotificationSettings.serviceUrl
=
http://notification:3458
edu.nrao.workspaces.UISettings.serviceUrl
=
http://localhost:4444/workspaces
edu.nrao.workspaces.CapabilitySettings.externalServiceUrl
=
http://capability:3457
#
# Processing Settings
#
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment