Merge branch 'release/04.12' into 'development'

Release/04.12

See merge request !17

Dockerfile

 ##########################################################################################
-# Base Stage 
+# Base Stage
 ##########################################################################################
 ARG BASE_REGISTRY=registry1.dso.mil
-ARG BASE_IMAGE=opensource/python/python38
-ARG BASE_TAG=3.8
+ARG BASE_IMAGE=ironbank/opensource/python/python38
+ARG BASE_TAG=3.8.10
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS base
 
 # Start off as root user
@@ -17,7 +17,7 @@ ENV PYTHON_VERSION=3.8 \
     PATH=$HOME/.local/bin/:/opt/app-root/src/bin:/opt/app-root/bin:$PATH \
     PYTHONUNBUFFERED=1 \
     PYTHONIOENCODING=UTF-8 \
-    PIP_NO_CACHE_DIR=yes \
+    PIP_NO_CACHE_DIR=off \
     LANG=en_US.UTF-8
 
 # - Enable the virtual python environment and default interactive and non-interactive 
@@ -26,12 +26,6 @@ ENV BASH_ENV=${APP_ROOT}/etc/py_enable \
     ENV=${APP_ROOT}/etc/py_enable \
     PROMPT_COMMAND=". ${APP_ROOT}/etc/py_enable"
 
-RUN dnf -y install sqlite-devel make gcc
-WORKDIR /opt/Python-3.8.10/
-RUN ./configure --enable-optimizations --prefix=/usr/local --enable-shared
-RUN make altinstall
-WORKDIR /
-
 # Setup library path
 ENV LD_LIBRARY_PATH=${APP_ROOT}/lib:/lib:/usr/lib:/usr/local/lib
 
@@ -73,7 +67,6 @@ WORKDIR /xmlsec
 RUN ls -l
 RUN rpm --import RPM-GPG-KEY-CentOS-Official && \
     dnf -y install xmlsec1-devel-1.2.25-4.el8.x86_64.rpm libtool-ltdl-devel-2.4.6-25.el8.x86_64.rpm xmlsec1-openssl-devel-1.2.25-4.el8.x86_64.rpm --setopt=tsflags=nodocs
-RUN dnf -y install sudo-1.8.29-7.el8.x86_64.rpm
 WORKDIR /
 RUN rm -rf /xmlsec
 
@@ -89,10 +82,10 @@ COPY ./*.tar.gz ./dependencies/
 
 RUN chown -R 1001:0 dependencies
 
-COPY ./simple_requirements.txt .
+COPY ./requirements.txt .
 RUN pip install --use-deprecated=legacy-resolver --no-index --find-links=dependencies/ --no-cache-dir -U setuptools
 RUN pip install --use-deprecated=legacy-resolver --no-index --find-links=dependencies/ --no-cache-dir numpy
-RUN pip install -v --use-deprecated=legacy-resolver --no-index --find-links=dependencies/ --no-cache-dir -r simple_requirements.txt
+RUN pip install -v --use-deprecated=legacy-resolver --no-index --find-links=dependencies/ --no-cache-dir -r requirements.txt
 
 RUN rm -r dependencies
 #Delete test directories containing test keys
@@ -103,7 +96,7 @@ RUN rm -rf /opt/app-root/lib/python3.8/site-packages/tornado/test/
 RUN rm *.zip || true
 RUN rm *.whl || true
 RUN rm *.tar.gz || true
-RUN dnf -y remove kernel-headers 
+RUN dnf -y remove kernel-headers sqlite-devel gcc make gcc-c++ git
 
 # Fix permissions
 RUN chown -R 1001:1001 $HOME

requirements.txt

+absl-py==0.11.0
+altgraph==0.17
+amqp==2.5.2
+anaconda-client==1.2.2
+APScheduler==3.6.3
+astor==0.8.1
+astroid==2.4.1
+asyncio==3.4.3
+atomicwrites==1.4.0
+attrs==19.3.0
+backcall==0.1.0
+billiard==3.6.3.0
+bokeh==2.1.1
+boto3==1.16.63
+botocore==1.19.63
+cachetools==4.1.0
+celery==4.4.0
+certifi==2020.4.5.1
+cffi==1.14.0
+chardet==3.0.4
+click==8.0.1
+clyent==1.2.1
+colorama==0.4.3
+cryptography==3.4.7
+cycler==0.10.0
+decorator==4.4.2
+defusedxml==0.6.0
+dill==0.3.2
+eli5==0.11.0
+Flask==1.1.2
+Flask-Cors==3.0.9
+Flask-PyMongo==2.3.0
+gast==0.2.2
+gevent==20.5.1
+google-auth==1.24.0
+google-auth-oauthlib==0.4.2
+google-pasta==0.2.0
+graphviz==0.14.1
+greenlet==0.4.15
+grpcio==1.28.1
+gunicorn==20.0.4
+h5py==2.10.0
+idna==2.9
+importlib-metadata==1.6.0
+ipython==7.14.0
+ipython-genutils==0.2.0
+isodate==0.6.0
+itsdangerous==1.1.0
+jedi==0.17.0
+Jinja2==2.11.3
+jmespath==0.10.0
+joblib==0.14.1
+Keras==2.3.1
+Keras-Applications==1.0.8
+Keras-Preprocessing==1.1.0
+kiwisolver==1.2.0
+kombu==4.6.8
+lazy-object-proxy==1.4.3
+lxml==4.6.3
+Markdown==3.2.1
+MarkupSafe==1.1.1
+matplotlib==3.2.1
+more-itertools==8.2.0
+networkx==2.4
+nltk==3.4.5
+numpy==1.18.3
+oauthlib==3.1.0
+opt-einsum==3.2.1
+packaging==20.3
+pandas==1.2.4
+pandas-datareader==0.8.1
+parso==0.7.0
+pexpect==4.8.0
+pickleshare==0.7.5
+Pillow==8.2.0
+pipdeptree==2.0.0
+pkgconfig==1.5.2
+pluggy==0.13.1
+prompt-toolkit==3.0.5
+protobuf==3.11.3
+ptyprocess==0.6.0
+pyasn1==0.4.8
+pyasn1-modules==0.2.8
+pycparser==2.20
+pycryptodome==3.9.7
+Pygments==2.9.0
+PyJWT==1.7.1
+pymongo==3.10.1
+PyMySQL==0.9.3
+pyodbc==4.0.30
+pyparsing==2.4.7
+python-dateutil==2.8.1
+python3-saml==1.9.0
+pytz==2020.1
+pyVIP==1.6.0
+PyYAML==5.4.1
+redis==3.5.0
+requests==2.23.0
+requests-oauthlib==1.3.0
+rsa==4.7.2
+s3transfer==0.3.3
+scikit-learn==0.24.2
+scipy==1.4.1
+semantic-version==2.8.5
+setuptools-rust==0.12.1
+setuptools-scm==6.0.1
+shap==0.35.0
+six==1.14.0
+sklearn==0.0
+SQLAlchemy==1.3.17
+tabulate==0.8.7
+termcolor==1.1.0
+threadpoolctl==2.1.0
+toml==0.10.2
+tornado==6.0.4
+tqdm==4.47.0
+traitlets==4.3.3
+typing-extensions==3.7.4.2
+tzlocal==2.1
+urllib3==1.25.9
+uuid==1.30
+vine==1.3.0
+wcwidth==0.1.9
+websocket==0.2.1
+websocket-client==0.57.0
+websockets==8.1
+Werkzeug==1.0.1
+wrapt==1.12.1
+xmlsec==1.3.9
+zipp==3.1.0
+zope.event==4.4
+zope.interface==5.1.0

simple_requirements.txt

-absl-py
-altgraph
-amqp
-anaconda-client
-APScheduler
-astor
-astroid
-asyncio
-atomicwrites
-attrs
-backcall
-billiard
-bokeh
-cachetools
-celery
-certifi
-cffi
-chardet
-click
-clyent
-colorama
-cryptography
-cycler
-decorator
-dill
-eli5
-Flask
-Flask-Cors
-Flask-PyMongo
-gast
-gevent
-google-auth
-google-auth-oauthlib
-google-pasta
-graphviz
-greenlet
-grpcio
-gunicorn
-h5py
-idna
-importlib-metadata
-ipython
-ipython-genutils
-itsdangerous
-jedi
-Jinja2
-joblib
-Keras
-Keras-Applications
-Keras-Preprocessing
-kiwisolver
-kombu
-lxml
-Markdown
-MarkupSafe
-matplotlib
-more-itertools
-networkx
-nltk
-numpy
-oauthlib
-opt-einsum
-packaging
-pandas
-pandas-datareader
-parso
-pickleshare
-Pillow
-pluggy
-prompt-toolkit
-protobuf
-pyasn1
-pyasn1-modules
-pycparser
-pycryptodome
-Pygments
-PyJWT
-pymongo
-PyMySQL
-pyodbc
-pyparsing
-python-dateutil
-pytz
-PyYAML
-redis
-requests
-requests-oauthlib
-rsa
-setuptools
-scikit-learn
-scipy
-shap
-six
-sklearn
-SQLAlchemy
-tabulate
-termcolor
-tornado
-tqdm
-traitlets
-typing-extensions
-urllib3
-vine
-wcwidth
-websocket
-websocket-client
-websockets
-Werkzeug
-wrapt
-zipp
-zope.event
-zope.interface
-python3-saml
-boto3
-pyVIP
\ No newline at end of file