convert docker to use python3

outbit · Feb 6, 2021 · 15a81c0 · 15a81c0
1 parent 779bf30
commit 15a81c0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -2,24 +2,23 @@ FROM debian:stable
 MAINTAINER David Whiteside <david@davidwhiteside.com>
 
 # pivportal-api dependencies
-RUN apt-get update && apt-get install -y python \
-  python-setuptools \
-  python-dev \
+RUN apt-get update && apt-get install -y python3.7 \
+  python3-pip \
+  python3.7-dev \
   build-essential \
   libffi-dev \
   openssl \
   libssl-dev \
   apache2 \
-  redis-server \
-  python-pip
-RUN pip install -U pip
-RUN pip install -U setuptools
+  redis-server
+RUN python3.7 -m pip install -U pip
+RUN python3.7 -m pip install -U setuptools
 
 # pivportal application user and group
 RUN groupadd -r pivportal && useradd -r -g pivportal pivportal
 
 # pivportal-api install latest stable
-RUN pip install -U pivportal
+RUN python3.7 -m pip install -U pivportal
 
 # Apache
 RUN a2enmod ssl

diff --git a/docker/httpd-pivportal.conf b/docker/httpd-pivportal.conf
@@ -6,7 +6,7 @@ NameVirtualHost *:80
 
 <VirtualHost *:80>
     ServerName pivportal
-    DocumentRoot /usr/local/lib/python2.7/dist-packages/pivportal/data_files/
+    DocumentRoot /usr/local/lib/python3.7/dist-packages/pivportal/data_files/
     Redirect permanent / https://pivportal/
 </VirtualHost>
 
@@ -23,10 +23,10 @@ NameVirtualHost *:80
     SSLVerifyDepth  5
 
     ServerName pivportal
-    DocumentRoot /usr/local/lib/python2.7/dist-packages/pivportal/data_files/
+    DocumentRoot /usr/local/lib/python3.7/dist-packages/pivportal/data_files/
     DirectoryIndex index.html
 
-    <Directory /usr/local/lib/python2.7/dist-packages/pivportal/data_files/>
+    <Directory /usr/local/lib/python3.7/dist-packages/pivportal/data_files/>
         Allow from all
         Order allow,deny
         AllowOverride All
@@ -80,10 +80,10 @@ NameVirtualHost *:80
     SSLVerifyDepth  5
 
     ServerName pivportal_client
-    DocumentRoot /usr/local/lib/python2.7/dist-packages/pivportal/data_files/
+    DocumentRoot /usr/local/lib/python3.7/dist-packages/pivportal/data_files/
     DirectoryIndex index.html
 
-    <Directory /usr/local/lib/python2.7/dist-packages/pivportal/data_files/>
+    <Directory /usr/local/lib/python3.7/dist-packages/pivportal/data_files/>
         Allow from all
         Order allow,deny
         AllowOverride All