Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cx-custom-gitlab-runner
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
Lukas Werner
cx-custom-gitlab-runner
Commits
3102b8d1
Commit
3102b8d1
authored
3 years ago
by
Lukas Werner
Browse files
Options
Downloads
Patches
Plain Diff
Fix namespaced auth
parent
3dcc821c
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
runner_scripts/root/cleanup.sh
+1
-1
1 addition, 1 deletion
runner_scripts/root/cleanup.sh
runner_scripts/root/config.sh
+1
-1
1 addition, 1 deletion
runner_scripts/root/config.sh
runner_scripts/root/run.sh
+1
-1
1 addition, 1 deletion
runner_scripts/root/run.sh
with
3 additions
and
3 deletions
runner_scripts/root/cleanup.sh
+
1
−
1
View file @
3102b8d1
...
@@ -36,7 +36,7 @@ id -u "$AUTH_USER" >/dev/null 2>&1 || error "User $AUTH_USER does not exist"
...
@@ -36,7 +36,7 @@ id -u "$AUTH_USER" >/dev/null 2>&1 || error "User $AUTH_USER does not exist"
## Use a key pair to authenticate the user (private key has to be set as a GitLab CI/CD variable)
## Use a key pair to authenticate the user (private key has to be set as a GitLab CI/CD variable)
AUTH_KEY
=
$CUSTOM_ENV_AUTH_KEY
AUTH_KEY
=
$CUSTOM_ENV_AUTH_KEY
AUTH_PUB
=
"/etc/gitlab-runner/auth/
${
CI_SERVER_HOST
}
/
${
CI_PROJECT_NAMESPACE
}
/
${
CI_PROJECT_NAME
}
/authorized_keys"
AUTH_PUB
=
"/etc/gitlab-runner/auth/
${
CUSTOM_ENV_
CI_SERVER_HOST
}
/
${
CUSTOM_ENV_
CI_PROJECT_NAMESPACE
}
/
${
CUSTOM_ENV_
CI_PROJECT_NAME
}
/authorized_keys"
if
[[
!
-f
"
$AUTH_PUB
"
]]
;
then
if
[[
!
-f
"
$AUTH_PUB
"
]]
;
then
error
"Authentication for user
$AUTH_USER
not configured for this project."
error
"Authentication for user
$AUTH_USER
not configured for this project."
...
...
This diff is collapsed.
Click to expand it.
runner_scripts/root/config.sh
+
1
−
1
View file @
3102b8d1
...
@@ -17,7 +17,7 @@ function error {
...
@@ -17,7 +17,7 @@ function error {
[
-z
"
${
CUSTOM_ENV_AUTH_USER
:+x
}
"
]
&&
error
"AUTH_USER CI/CD variable has not been set."
[
-z
"
${
CUSTOM_ENV_AUTH_USER
:+x
}
"
]
&&
error
"AUTH_USER CI/CD variable has not been set."
[
-z
"
${
CUSTOM_ENV_AUTH_KEY
:+x
}
"
]
&&
error
"AUTH_KEY secret CI/CD variable has not been set."
[
-z
"
${
CUSTOM_ENV_AUTH_KEY
:+x
}
"
]
&&
error
"AUTH_KEY secret CI/CD variable has not been set."
AUTH_PUB
=
"/etc/gitlab-runner/auth/
${
CI_SERVER_HOST
}
/
${
CI_PROJECT_NAMESPACE
}
/
${
CI_PROJECT_NAME
}
/authorized_keys"
AUTH_PUB
=
"/etc/gitlab-runner/auth/
${
CUSTOM_ENV_
CI_SERVER_HOST
}
/
${
CUSTOM_ENV_
CI_PROJECT_NAMESPACE
}
/
${
CUSTOM_ENV_
CI_PROJECT_NAME
}
/authorized_keys"
if
[[
!
-f
"
$AUTH_PUB
"
]]
;
then
if
[[
!
-f
"
$AUTH_PUB
"
]]
;
then
error
"Authentication for user
$AUTH_USER
not configured for this project."
error
"Authentication for user
$AUTH_USER
not configured for this project."
fi
fi
...
...
This diff is collapsed.
Click to expand it.
runner_scripts/root/run.sh
+
1
−
1
View file @
3102b8d1
...
@@ -41,7 +41,7 @@ id -u "$AUTH_USER" >/dev/null 2>&1 || error "User $AUTH_USER does not exist"
...
@@ -41,7 +41,7 @@ id -u "$AUTH_USER" >/dev/null 2>&1 || error "User $AUTH_USER does not exist"
## Use a key pair to authenticate the user (private key has to be set as a GitLab CI/CD variable)
## Use a key pair to authenticate the user (private key has to be set as a GitLab CI/CD variable)
AUTH_KEY
=
$CUSTOM_ENV_AUTH_KEY
AUTH_KEY
=
$CUSTOM_ENV_AUTH_KEY
AUTH_PUB
=
"/etc/gitlab-runner/auth/
${
CI_SERVER_HOST
}
/
${
CI_PROJECT_NAMESPACE
}
/
${
CI_PROJECT_NAME
}
/authorized_keys"
AUTH_PUB
=
"/etc/gitlab-runner/auth/
${
CUSTOM_ENV_
CI_SERVER_HOST
}
/
${
CUSTOM_ENV_
CI_PROJECT_NAMESPACE
}
/
${
CUSTOM_ENV_
CI_PROJECT_NAME
}
/authorized_keys"
if
[[
!
-f
"
$AUTH_PUB
"
]]
;
then
if
[[
!
-f
"
$AUTH_PUB
"
]]
;
then
error
"Authentication for user
$AUTH_USER
not configured for this project."
error
"Authentication for user
$AUTH_USER
not configured for this project."
...
...
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