From 2f0f53f276e26ef16109fbe704fe1ebc9b7f29c1 Mon Sep 17 00:00:00 2001
From: Tanner Prestegard <tanner.prestegard@ligo.org>
Date: Wed, 18 Sep 2019 09:33:13 -0500
Subject: [PATCH] docker: convert containers to use Python 3
---
Dockerfile | 20 ++++++++++----------
docker/check_shibboleth_status | 2 +-
docker/cleanup | 6 +++---
docker/entrypoint | 2 +-
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index d349e3782..5ef4cf53d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
FROM ligo/base:stretch
LABEL name="LIGO GraceDB Django application" \
maintainer="tanner.prestegard@ligo.org" \
- date="20190430"
+ date="20190920"
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/python2.7/dist-packages:$PYTHONPATH
+ENV PYTHONPATH /usr/local/lib/python3.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
+ python3 manage.py collectstatic --noinput
RUN rm -rf /app/logs/* /app/project_data/*
diff --git a/docker/check_shibboleth_status b/docker/check_shibboleth_status
index 0e30bfda2..71cfb0c0f 100644
--- a/docker/check_shibboleth_status
+++ b/docker/check_shibboleth_status
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
'''
Pulls Shibboleth status.sso page, checks for:
diff --git a/docker/cleanup b/docker/cleanup
index 5ccf6dc81..13e6994f8 100644
--- a/docker/cleanup
+++ b/docker/cleanup
@@ -1,5 +1,5 @@
#!/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
+python3 /app/gracedb_project/manage.py update_user_accounts_from_ligo_ldap people
+python3 /app/gracedb_project/manage.py remove_inactive_alerts
+python3 /app/gracedb_project/manage.py clearsessions
diff --git a/docker/entrypoint b/docker/entrypoint
index 9d8be7681..ccc392808 100644
--- a/docker/entrypoint
+++ b/docker/entrypoint
@@ -1,4 +1,4 @@
#!/bin/bash
-export LVALERT_OVERSEER_RESOURCE=${LVALERT_USER}_overseer_$(python -c 'import uuid; print(uuid.uuid4().hex)')
+export LVALERT_OVERSEER_RESOURCE=${LVALERT_USER}_overseer_$(python3 -c 'import uuid; print(uuid.uuid4().hex)')
exec "$@"
--
GitLab