File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -15,7 +15,7 @@ ARG SOURCE_BRANCH
1515# Build WireCloud wheel
1616RUN git clone -b "${SOURCE_BRANCH}" --depth=1 --single-branch https://github.com/"${GITHUB_ACCOUNT}" /"${GITHUB_REPOSITORY}" .git && \
1717 apt-get update && apt-get install -y gettext && \
18- pip install "django<=1.11 " && \
18+ pip install "django<=2.3 " && \
1919 cd "${GITHUB_REPOSITORY}" /src && \
2020 python setup.py bdist_wheel
2121
@@ -49,7 +49,7 @@ RUN apt-get update && \
4949 pip install --no-cache-dir /dist/*.whl && \
5050 rm -rf /dist && \
5151 adduser --system --group --shell /bin/bash wirecloud && \
52- pip install --no-cache-dir channels asgi_ipc asgi_redis asgi_rabbitmq wirecloud-keycloak && \
52+ pip install --no-cache-dir " channels<2.3" "channels-redis" "channels-rabbitmq" wirecloud-keycloak && \
5353 mkdir -p /opt/wirecloud_instance /var/www/static && \
5454 cd /opt && \
5555 wirecloud-admin startproject wirecloud_instance wirecloud_instance && \
Original file line number Diff line number Diff line change 33
44import os
55from wirecloud .commons .utils .conf import load_default_wirecloud_conf
6- from django .core . urlresolvers import reverse_lazy
6+ from django .urls import reverse_lazy
77
88DEBUG = os .environ .get ("DEBUG" , "False" ).strip ().lower () == "true"
99BASEDIR = os .path .dirname (os .path .abspath (__file__ ))
Original file line number Diff line number Diff line change 1313
1414admin .autodiscover ()
1515
16- login_method = django_auth .login
16+ login_method = django_auth .LoginView . as_view ()
1717if settings .IDM_AUTH == 'fiware' :
1818 login_method = wc_fiware .login
1919
3434 url (r'^admin/logout/?$' , wc_auth .logout ),
3535
3636 # Admin interface
37- url (r'^admin/' , include ( admin .site .urls ) ),
37+ url (r'^admin/' , admin .site .urls ),
3838)
3939
4040if settings .IDM_AUTH :
You can’t perform that action at this time.
0 commit comments