Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
GraceDB Server
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
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
Code review analytics
Issue analytics
Insights
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
Michael William Coughlin
GraceDB Server
Commits
7df117e3
Verified
Commit
7df117e3
authored
6 years ago
by
Thomas Downes
Committed by
Tanner Prestegard
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Explicitly set LVAalert Overseer Resource to randomized string
parent
064d0c13
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Dockerfile
+4
-1
4 additions, 1 deletion
Dockerfile
docker/entrypoint
+4
-0
4 additions, 0 deletions
docker/entrypoint
docker/supervisord-lvalert-overseer.conf
+1
-0
1 addition, 0 deletions
docker/supervisord-lvalert-overseer.conf
with
9 additions
and
1 deletion
Dockerfile
+
4
−
1
View file @
7df117e3
...
...
@@ -34,6 +34,7 @@ RUN apt-get update && \
apt-get clean
&&
\
npm
install
-g
bower
COPY
docker/entrypoint /usr/local/bin/entrypoint
COPY
docker/supervisord.conf /etc/supervisor/supervisord.conf
COPY
docker/supervisord-apache2.conf /etc/supervisor/conf.d/apache2.conf
COPY
docker/supervisord-lvalert-overseer.conf /etc/supervisor/conf.d/overseer.conf
...
...
@@ -92,9 +93,11 @@ RUN useradd -M -u 50001 -g www-data -s /bin/false gracedb
# set secure file/directory permissions. In particular, ADD command at
# beginning of recipe inherits umask of user running the build
RUN
chown
gracedb:www-data /app/logs /app/project_data
&&
\
RUN
chmod
0755 /usr/local/bin/entrypoint
&&
\
chown
gracedb:www-data /app/logs /app/project_data
&&
\
chmod
0750 /app/logs /app/project_data
&&
\
find /app/gracedb_project
-type
d
-exec
chmod
0755
{}
+
&&
\
find /app/gracedb_project
-type
f
-exec
chmod
0644
{}
+
ENTRYPOINT
[ "/usr/local/bin/entrypoint" ]
CMD
["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]
This diff is collapsed.
Click to expand it.
docker/entrypoint
0 → 100644
+
4
−
0
View file @
7df117e3
#!/bin/bash
export
LVALERT_OVERSEER_RESOURCE
=
${
LVALERT_USER
}
_overseer_
$(
python
-c
'import uuid; print(uuid.uuid4().hex)'
)
exec
"
$@
"
This diff is collapsed.
Click to expand it.
docker/supervisord-lvalert-overseer.conf
+
1
−
0
View file @
7df117e3
[
program
:
overseer
]
command
=
lvalert_overseer
-
a
%(
ENV_LVALERT_USER
)
s
-
b
%(
ENV_LVALERT_PASSWORD
)
s
-
s
%(
ENV_LVALERT_SERVER
)
s
-
p
%(
ENV_LVALERT_OVERSEER_PORT
)
s
-
r
%(
ENV_LVALERT_OVERSEER_RESOURCE
)
s
-
l
/
tmp
/
overseer_stdout
.
log
-
e
/
tmp
/
overseer_stderr
.
log
user
=
gracedb
group
=
www
-
data
...
...
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