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
2f0f53f2
Commit
2f0f53f2
authored
5 years ago
by
Tanner Prestegard
Committed by
GraceDB
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
docker: convert containers to use Python 3
parent
c877bcfc
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
Dockerfile
+10
-10
10 additions, 10 deletions
Dockerfile
docker/check_shibboleth_status
+1
-1
1 addition, 1 deletion
docker/check_shibboleth_status
docker/cleanup
+3
-3
3 additions, 3 deletions
docker/cleanup
docker/entrypoint
+1
-1
1 addition, 1 deletion
docker/entrypoint
with
15 additions
and
15 deletions
Dockerfile
+
10
−
10
View file @
2f0f53f2
FROM
ligo/base:stretch
LABEL
name="LIGO GraceDB Django application" \
maintainer="tanner.prestegard@ligo.org" \
date="20190
43
0"
date="20190
92
0"
ARG
SETTINGS_MODULE="config.settings.container.dev"
COPY
docker/SWITCHaai-swdistrib.gpg /etc/apt/trusted.gpg.d
...
...
@@ -24,11 +24,10 @@ RUN apt-get update && \
mariadb-client
\
nodejs
\
osg-ca-certs
\
python2.7
\
python2.7-dev
\
python-libxml2
\
python-pip
\
python-voeventlib
\
python3.5
\
python3.5-dev
\
python3-libxml2
\
python3-pip
\
procps
\
shibboleth
\
supervisor
\
...
...
@@ -61,11 +60,12 @@ ADD . /app/gracedb_project
# install gracedb application itself
WORKDIR
/app/gracedb_project
RUN
bower
install
--allow-root
RUN
pip
install
--upgrade
setuptools wheel
&&
\
pip
install
-r
requirements.txt
RUN
pip3
install
--upgrade
pip
RUN
pip3
install
--upgrade
setuptools wheel
&&
\
pip3
install
-r
requirements.txt
# Give pip-installed packages priority over distribution packages
ENV
PYTHONPATH /usr/local/lib/python
2.7
/dist-packages:$PYTHONPATH
ENV
PYTHONPATH /usr/local/lib/python
3.5
/dist-packages:$PYTHONPATH
ENV
ENABLE_SHIBD false
ENV
ENABLE_OVERSEER true
ENV
VIRTUAL_ENV dummy
...
...
@@ -97,7 +97,7 @@ RUN DJANGO_SETTINGS_MODULE=${SETTINGS_MODULE} \
DJANGO_TWILIO_AUTH_TOKEN
=
fake_token
\
AWS_SES_ACCESS_KEY_ID
=
fake_aws_id
\
AWS_SES_SECRET_ACCESS_KEY
=
fake_aws_key
\
python manage.py collectstatic
--noinput
python
3
manage.py collectstatic
--noinput
RUN
rm
-rf
/app/logs/
*
/app/project_data/
*
...
...
This diff is collapsed.
Click to expand it.
docker/check_shibboleth_status
+
1
−
1
View file @
2f0f53f2
#!/usr/bin/python
#!/usr/bin/python
3
'''
Pulls Shibboleth status.sso page, checks for:
...
...
This diff is collapsed.
Click to expand it.
docker/cleanup
+
3
−
3
View file @
2f0f53f2
#!/bin/sh
python /app/gracedb_project/manage.py update_user_accounts_from_ligo_ldap people
python /app/gracedb_project/manage.py remove_inactive_alerts
python /app/gracedb_project/manage.py clearsessions
python
3
/app/gracedb_project/manage.py update_user_accounts_from_ligo_ldap people
python
3
/app/gracedb_project/manage.py remove_inactive_alerts
python
3
/app/gracedb_project/manage.py clearsessions
This diff is collapsed.
Click to expand it.
docker/entrypoint
+
1
−
1
View file @
2f0f53f2
#!/bin/bash
export
LVALERT_OVERSEER_RESOURCE
=
${
LVALERT_USER
}
_overseer_
$(
python
-c
'import uuid; print(uuid.uuid4().hex)'
)
export
LVALERT_OVERSEER_RESOURCE
=
${
LVALERT_USER
}
_overseer_
$(
python
3
-c
'import uuid; print(uuid.uuid4().hex)'
)
exec
"
$@
"
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