Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
nshmp-ws-static
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
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ghsc
National Seismic Hazard Model Project
nshmp-ws-static
Commits
6b1006f2
Commit
6b1006f2
authored
2 years ago
by
Clayton, Brandon Scott
Browse files
Options
Downloads
Patches
Plain Diff
Remove gradle dependency auth
parent
43dda78e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!124
Production Release | nshmp-ws-static
,
!123
Resolves - Remove GITLAB_TOKEN Requirement and AASHTO-2023 web service -- add CSV response
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Dockerfile
+1
-3
1 addition, 3 deletions
Dockerfile
gradle/repositories.gradle
+2
-18
2 additions, 18 deletions
gradle/repositories.gradle
with
3 additions
and
21 deletions
Dockerfile
+
1
−
3
View file @
6b1006f2
...
...
@@ -10,9 +10,7 @@ ARG FROM_IMAGE=usgs/amazoncorretto:11
FROM
${BUILD_IMAGE}
as
builder
# TODO: Token needed until nshmp-lib is public
ARG
GITLAB_TOKEN=null
ARG
CI_JOB_TOKEN=null
# For GitLab CI/CD
ARG
CI_PROJECT_URL=null
ARG
CI_COMMIT_BRANCH=null
...
...
This diff is collapsed.
Click to expand it.
gradle/repositories.gradle
+
2
−
18
View file @
6b1006f2
...
...
@@ -7,23 +7,7 @@ repositories {
}
maven
{
url
"https://code.usgs.gov/api/v4/groups/160/-/packages/maven"
name
"GitLab"
if
(
System
.
getenv
(
"CI_JOB_TOKEN"
)
&&
System
.
getenv
(
"CI_JOB_TOKEN"
)
!=
"null"
)
{
credentials
(
HttpHeaderCredentials
)
{
name
=
"Job-Token"
value
=
System
.
getenv
(
"CI_JOB_TOKEN"
)
}
}
else
if
(
System
.
getenv
(
"GITLAB_TOKEN"
)
&&
System
.
getenv
(
"GITLAB_TOKEN"
)
!=
"null"
)
{
credentials
(
HttpHeaderCredentials
)
{
name
=
"Private-Token"
value
=
System
.
getenv
(
"GITLAB_TOKEN"
)
}
}
else
{
throw
new
GradleException
(
"CI_JOB_TOKEN or GITLAB_TOKEN environmental variable must be set"
)
}
authentication
{
header
(
HttpHeaderAuthentication
)
}
url
"https://code.usgs.gov/api/v4/groups/1352/-/packages/maven"
name
"NSHMP GitLab Group"
}
}
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