diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b48e8a5a295f3f62cfc40c8f4b304db2f93e553a..11d847c36a7500a3d19e508416b9d3904ba2f574 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,9 +4,9 @@ stages: build: stage: build - image: docker:19.03.0 + image: docker:20.10 services: - - docker:19.03.0-dind + - docker:20.10-dind variables: DOCKER_DRIVER: overlay2 DOCKER_TLS_CERTDIR: "/certs" diff --git a/Dockerfile b/Dockerfile index 203833c71747614773a6a7ed0d13434978312c98..b724606844004d63a53c688a02d946641b6cbec5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu WORKDIR /opt/strudel2/src COPY . /opt/strudel2/src RUN apt update && apt install -y python3 gcc python3-pip openssh-client -RUN pip3 install -r requirements.txt && python3 ./setup.py install +RUN pip3 install -r requirements.txt && pip install . RUN mkdir -p /var/www/.ssh && chown www-data:www-data /var/www/.ssh && chmod 700 /var/www/.ssh EXPOSE 8080 8090 CMD ["./runscript"] diff --git a/requirements.txt b/requirements.txt index 349374fcb9d39da5e82f7328caa2d2918a25f47b..c5e8cb01aeedadc5e331b07e32ae9e593f5de342 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,24 +1,21 @@ -aniso8601==3.0.2 -certifi==2018.8.24 -chardet==3.0.4 -Click==7.0 -Flask==1.0.2 -Flask-Cors==3.0.6 -Flask-OAuthlib==0.9.5 -Flask-RESTful==0.3.6 -idna==2.7 -itsdangerous==0.24 -Jinja2==2.10 -MarkupSafe==1.0 -oauthlib==2.1.0 -python-dateutil==2.7.5 -pytz==2018.5 -PyYAML==3.13 -requests==2.19.1 -requests-oauthlib==1.0.0 -setuptools==39.0.1 -six==1.11.0 -SQLAlchemy==1.2.12 -urllib3==1.23 -Werkzeug==0.14.1 -uwsgi==2.0.17.1 +aniso8601==9.0.1 +certifi==2021.10.8 +chardet==4.0.0 +charset-normalizer==2.0.10 +click==8.0.3 +Flask==2.0.2 +greenlet==1.1.2 +idna==3.3 +itsdangerous==2.0.1 +Jinja2==3.0.3 +MarkupSafe==2.0.1 +oauthlib==3.1.1 +pip==21.3.1 +pytz==2021.3 +requests==2.27.1 +requests-oauthlib==1.3.0 +six==1.16.0 +SQLAlchemy==1.4.30 +urllib3==1.26.8 +uWSGI==2.0.20 +Werkzeug==2.0.2 diff --git a/tes/__init__.py b/tes/__init__.py index 1876a71543017432ce05d53f74cdc628eebb9c89..911593baea5ccf81a7616b04654e92f93a71f844 100644 --- a/tes/__init__.py +++ b/tes/__init__.py @@ -13,7 +13,7 @@ app.config['SESSION_REFRESH_EACH_REQUEST'] = True app.config['SESSION_COOKIE_NAME'] = 'tessession' app.config['SESSION_COOKIE_SECURE'] = True app.config['SESSION_COOKIE_HTTPONLY'] = True -app.config['SESSION_COOKIE_SAMESITE'] = None +app.config['SESSION_COOKIE_SAMESITE'] = 'None' app.config['APPLICATION_ROOT'] = '/' if 'FLASK_ENV' in os.environ and os.environ['FLASK_ENV'] == 'development': DEV=True