diff options
| author | Jonathan DeMasi <jonathan.demasi@colorado.edu> | 2020-05-11 16:03:02 -0600 |
|---|---|---|
| committer | Jonathan DeMasi <jonathan.demasi@colorado.edu> | 2020-05-11 16:03:02 -0600 |
| commit | 0db662e521fadbf091872118f46550bc6da45eda (patch) | |
| tree | a9d8b16882a82b5ae8cdd281cf95cb99effce178 | |
| parent | df8997d24409c0a1fc9a7d1ff04158bfabe24e09 (diff) | |
| download | jthanio-0db662e521fadbf091872118f46550bc6da45eda.tar jthanio-0db662e521fadbf091872118f46550bc6da45eda.tar.gz jthanio-0db662e521fadbf091872118f46550bc6da45eda.tar.bz2 jthanio-0db662e521fadbf091872118f46550bc6da45eda.tar.lz jthanio-0db662e521fadbf091872118f46550bc6da45eda.tar.xz jthanio-0db662e521fadbf091872118f46550bc6da45eda.tar.zst jthanio-0db662e521fadbf091872118f46550bc6da45eda.zip | |
updated requirements to new versions, added docker things to piss brent off
| -rw-r--r-- | .dockerignore | 32 | ||||
| -rw-r--r-- | Dockerfile | 17 | ||||
| -rw-r--r-- | docker-compose.yml | 10 | ||||
| -rw-r--r-- | requirements.txt | 19 |
4 files changed, 70 insertions, 8 deletions
diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..d3a1f2a --- /dev/null +++ b/.dockerignore @@ -0,0 +1,32 @@ +.git +db.sqlite3 +venv + +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..873e97d --- /dev/null +++ b/Dockerfile @@ -0,0 +1,17 @@ +FROM archlinux:latest +LABEL maintainer="me@jrdemasi.com" + +RUN pacman -Syyu --noconfirm +RUN pacman -S --noconfirm python python-pip +WORKDIR /code +COPY ./requirements.txt /code/ +ENV VIRTUAL_ENV=/code/venv +RUN python3 -m venv $VIRTUAL_ENV +ENV PATH="$VIRTUAL_ENV/bin:$PATH" +RUN pip install -r /code/requirements.txt +COPY . /code/ +RUN /code/manage.py migrate +ENV DJANGO_SUPERUSER_PASSWORD=admin +RUN /code/manage.py createsuperuser --noinput --username admin --email admin@admin.com +EXPOSE 5000 +CMD /code/manage.py runserver 0.0.0.0:5000 diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..4f35d22 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,10 @@ +version: '3.7' + +services: + app: + build: + context: . + environment: + - PATH=/code/venv/bin:$PATH + ports: + - "5000:5000" diff --git a/requirements.txt b/requirements.txt index ac71aca..4eb0c70 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ asgiref==3.2.7 -beautifulsoup4==4.6.0 -certifi==2019.11.28 +beautifulsoup4==4.8.2 +certifi==2020.4.5.1 chardet==3.0.4 -Django==3.0.5 +Django==3.0.6 django-modelcluster==5.0.1 django-taggit==1.2.0 django-treebeard==4.3.1 @@ -11,14 +11,17 @@ draftjs-exporter==2.1.7 html5lib==1.0.1 idna==2.9 l18n==2018.5 -Pillow==6.2.2 -pytz==2019.3 +Pillow==7.1.2 +pytz==2020.1 requests==2.23.0 six==1.14.0 +soupsieve==2.0 sqlparse==0.3.1 Unidecode==1.1.1 -urllib3==1.25.8 -wagtail==2.8 +urllib3==1.25.9 +wagtail==2.9 +wagtail-whoosh==0.2.4 webencodings==0.5.1 +Whoosh==2.7.4 Willow==1.3 -wagtail-whoosh +XlsxWriter==1.2.8 |