Merge version 3.5.5-1 (#320)

Author: mxmeinhold

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9-slim-buster
+FROM docker.io/python:3.9-slim-buster
 MAINTAINER Devin Matte <[email protected]>
 
 ENV DD_LOGS_INJECTION=true
@@ -11,13 +11,13 @@ RUN mkdir /opt/packet
 
 WORKDIR /opt/packet
 
-COPY requirements.txt /opt/packet
+COPY requirements.txt requirements-freeze.txt /opt/packet/
 
-RUN pip install -r requirements.txt
+RUN pip install -r requirements.txt -r requirements-freeze.txt
 
 COPY . /opt/packet
 
-RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - && \
+RUN curl -sL https://deb.nodesource.com/setup_10.x | grep -v 'sleep 20' | bash - && \
     curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
     echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
     apt-get -yq update && \

package.json

@@ -1,7 +1,7 @@
 {
   "title": "CSH Packet",
   "name": "csh-packet",
-  "version": "3.5.5",
+  "version": "3.5.5-1",
   "description": "A web app implementation of the CSH introductory packet.",
   "bugs": {
     "url": "https://github.com/ComputerScienceHouse/packet/issues",

requirements-freeze.txt

@@ -0,0 +1,64 @@
+# Please don't edit this file manually.
+# You can regenerate it with `pip freeze > requirements-freeze.txt`
+alembic==1.7.7
+astroid==2.6.6
+attrs==21.4.0
+Beaker==1.11.0
+blinker==1.4
+certifi==2021.10.8
+cffi==1.15.0
+charset-normalizer==2.0.12
+click==7.1.2
+cryptography==36.0.2
+csh-ldap==2.3.1
+ddtrace==0.57.3
+defusedxml==0.7.1
+dnspython==2.2.1
+Flask==1.1.4
+Flask-gzip==0.2
+Flask-Mail==0.9.1
+Flask-Migrate==2.7.0
+Flask-pyoidc==3.7.0
+Flask-SQLAlchemy==2.5.1
+future==0.18.2
+greenlet==1.1.2
+gunicorn==20.0.4
+idna==3.3
+importlib-resources==5.4.0
+isort==5.10.1
+itsdangerous==1.1.0
+Jinja2==2.11.3
+lazy-object-proxy==1.7.1
+Mako==1.2.0
+MarkupSafe==2.0.1
+mccabe==0.6.1
+mypy==0.931
+mypy-extensions==0.4.3
+oic==1.3.0
+onesignal-sdk==1.0.0
+packaging==21.3
+protobuf==3.19.4
+psycopg2-binary==2.8.6
+pyasn1==0.4.8
+pyasn1-modules==0.2.8
+pycparser==2.21
+pycryptodomex==3.14.1
+pyjwkest==1.4.2
+pylint==2.7.4
+pylint-quotes==0.2.1
+pyparsing==3.0.7
+python-ldap==3.0.0
+requests==2.27.1
+sentry-sdk==1.0.0
+six==1.16.0
+SQLAlchemy==1.4.32
+sqlalchemy2-stubs==0.0.2a20
+srvlookup==2.0.0
+tenacity==8.0.1
+toml==0.10.2
+tomli==2.0.1
+typing_extensions==4.1.1
+urllib3==1.26.9
+Werkzeug==1.0.1
+wrapt==1.12.1
+zipp==3.7.0

requirements.txt

@@ -1,16 +1,19 @@
-Flask-Gzip~=0.2
-Flask-Mail~=0.9.1
+Flask-Gzip==0.2
+Flask-Mail==0.9.1
 Flask-Migrate~=2.7.0
 Flask-pyoidc~=3.7.0
-Flask~=1.1.2
+Flask~=1.1.4
 csh_ldap~=2.3.1
-ddtrace
+ddtrace==0.57.3
 flask_sqlalchemy~=2.5.1
 gunicorn~=20.0.4
-mypy
+mypy==0.931
 onesignal-sdk~=1.0.0
 psycopg2-binary~=2.8.6
-pylint-quotes~=0.2.1
-pylint~=2.7.2
+pylint-quotes==0.2.1
+pylint~=2.7.4
 sentry-sdk~=1.0.0
-sqlalchemy[mypy]
+sqlalchemy[mypy]~=1.4.31
+
+# Broken transitive dependency we should version
+MarkupSafe~=2.0.1