Skip to content

modify middleware settings and url paths for django 2.0 #1503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrewsg merged 9 commits into from
Jul 13, 2018
Merged

modify middleware settings and url paths for django 2.0 #1503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
66a4674
modify middleware settings
hirokts May 26, 2018
45eff95
Modify Python version to adjust with Django version
hirokts May 27, 2018
49e5756
use python3.6
hirokts Jun 18, 2018
bb8dbac
modify the comment of virtualenv
hirokts Jun 19, 2018
2d16591
modify the comment of virtualenv
hirokts Jun 19, 2018
5bc58e2
modify python version for virtualenv
hirokts Jun 21, 2018
9405401
modify url path
hirokts Jun 21, 2018
ddc5224
Merge branch 'master' of https://github.com/hirokts/python-docs-samples
hirokts Jun 21, 2018
cf3c6c6
modify importing of mysite/urls.py
hirokts Jun 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions container_engine/django_tutorial/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
FROM gcr.io/google_appengine/python

# Create a virtualenv for the application dependencies.
# # If you want to use Python 3, add the -p python3.4 flag.
RUN virtualenv /env
# # If you want to use Python 2, use the -p python2.7 flag.
RUN virtualenv -p python3 /env
ENV PATH /env/bin:$PATH

ADD requirements.txt /app/requirements.txt
RUN /env/bin/pip install -r /app/requirements.txt
RUN /env/bin/pip install --upgrade pip && /env/bin/pip install -r /app/requirements.txt
ADD . /app

CMD gunicorn -b :$PORT mysite.wsgi
Expand Down
5 changes: 2 additions & 3 deletions container_engine/django_tutorial/mysite/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,14 @@
'polls'
)

MIDDLEWARE_CLASSES = (
MIDDLEWARE = (
'django.middleware.security.SecurityMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
'django.middleware.security.SecurityMiddleware',
)

ROOT_URLCONF = 'mysite.urls'
Expand Down
7 changes: 4 additions & 3 deletions container_engine/django_tutorial/mysite/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,14 @@
# limitations under the License.

from django.conf import settings
from django.conf.urls import include, url
from django.contrib import admin
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
from django.urls import include, path


urlpatterns = [
url(r'^', include('polls.urls')),
url(r'^admin/', admin.site.urls)
path('admin/', admin.site.urls),
path('', include('polls.urls')),
]

# Only serve static files from Django during development
Expand Down
4 changes: 2 additions & 2 deletions container_engine/django_tutorial/polls/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.

from django.conf.urls import url
from django.urls import path

from . import views

urlpatterns = [
url(r'^$', views.index, name='index')
path('', views.index, name='index')
]