Skip to content

Commit

Permalink
Version 2 kick off with docker support
Browse files Browse the repository at this point in the history
  • Loading branch information
mkalish committed Oct 15, 2018
1 parent bc414a5 commit b4ab608
Show file tree
Hide file tree
Showing 212 changed files with 37 additions and 11,424 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,8 @@ __pycache__
.vagrant

*.c9

.Python
.python-version
lib
include
12 changes: 0 additions & 12 deletions .gitmodules

This file was deleted.

20 changes: 13 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
# TODO: split this into base, develop, and release images
### This file defines the ancfinder container
FROM python:3.7.0

FROM python:3.6.4
WORKDIR /srv/app
COPY . /srv/app

COPY ./requirements.txt /srv/app/requirements.txt
RUN pip install -r requirements.txt

COPY ./ancfinder /srv/app/ancfinder
COPY ./ancfinder_site /srv/app/ancfinder_site
COPY ./manage.py /srv/app/manage.py



EXPOSE 8000

# Ensure that the model and database are correctly mapped
RUN python3 manage.py makemigrations
RUN python3 manage.py migrate
# RUN python3 manage.py makemigrations
# RUN python3 manage.py migrate

# Run these when the container launches
CMD ["python", "manage.py", "runserver", "0.0.0.0:8000"]
CMD ["python", "manage.py", "runserver", "0.0.0.0:8000"]
2 changes: 1 addition & 1 deletion ancfinder/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@
urlpatterns = [
path('', include('ancfinder_site.urls')),
path('admin/', admin.site.urls),
path('well-known/', include('letsencrypt.urls')),
# path('well-known/', include('letsencrypt.urls')),
]
3 changes: 0 additions & 3 deletions ancfinder_site/ext/django-annotator-store/.gitignore

This file was deleted.

24 changes: 0 additions & 24 deletions ancfinder_site/ext/django-annotator-store/LICENSE

This file was deleted.

34 changes: 0 additions & 34 deletions ancfinder_site/ext/django-annotator-store/README.md

This file was deleted.

Empty file.
6 changes: 0 additions & 6 deletions ancfinder_site/ext/django-annotator-store/annotator/admin.py

This file was deleted.

66 changes: 0 additions & 66 deletions ancfinder_site/ext/django-annotator-store/annotator/models.py

This file was deleted.

This file was deleted.

16 changes: 0 additions & 16 deletions ancfinder_site/ext/django-annotator-store/annotator/tests.py

This file was deleted.

15 changes: 0 additions & 15 deletions ancfinder_site/ext/django-annotator-store/annotator/urls.py

This file was deleted.

Loading

0 comments on commit b4ab608

Please sign in to comment.