Merge pull request #476 from fasrc/cp_build_improvements

image build improvements

Author: claire-peters

Dockerfile

@@ -12,8 +12,11 @@ LABEL org.opencontainers.image.description="fasrc coldfront application"
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
-    && apt-get install -y redis redis-server vim \
-    && apt-get install -y libsasl2-dev libldap2-dev libssl-dev \
+        redis-server \
+        vim \
+        libsasl2-dev \
+        libldap2-dev \
+        libssl-dev \
     && rm -rf /var/lib/apt/lists/*
 RUN mkdir ~/.ssh && echo "Host git*\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
 
@@ -26,14 +29,13 @@ COPY etc/ipython_init.py ${IPYTHON_STARTUP}
 
 
 RUN pip install --upgrade pip && \
-    pip install vastpy && \
     pip install -r requirements.txt
 
-COPY . .
+RUN pip install django-prometheus gunicorn
 
 RUN if [ "${BUILD_ENV}" = "dev" ]; then pip install django-redis django-debug-toolbar; fi
 
-RUN pip install django-prometheus gunicorn
+COPY . .
 
 ENV PYTHONPATH /usr/src/app:/usr/src/app/ifxreport:/usr/src/app/ifxbilling:/usr/src/app/fiine.client:/usr/src/app/ifxurls:/usr/src/app/nanites.client:/usr/src/app/ifxuser:/usr/src/app/ifxmail.client:/usr/src/app/ifxec
 

requirements.txt

@@ -12,7 +12,7 @@ django-crispy-forms==2.1
 django-environ==0.11.2
 django-model-utils==4.4.0
 django-picklefield==3.1
-django-q2==1.5.1
+django-q2==1.7.6
 django-settings-export==1.2.1
 django-simple-history==3.5.0
 django-split-settings==1.3.0
@@ -54,19 +54,19 @@ django-mathfilters==1.0.0
 django-tables2==2.3.4
 djangorestframework==3.15.2
 djangorestframework-datatables==0.7.0
-ipython==7.16.3
+ipython==8.39.0
 isilon-sdk==0.7.0
 jinja2
 knox
 ldap3
 logging_tree==1.9
 mysqlclient==2.2.0
 natural-keys
-python-dateutil
 python-json-logger
 pandas==2.2.1
 reportlab==4.0.5
 xhtml2pdf==0.2.15
 XlsxWriter
 git+https://github.com/fasrc/slurmrest_python_sdk.git
 git+https://github.com/fasrc/sftocf.git
+vastpy