add-package docker

.gitlab-ci.yml

@@ -43,6 +43,23 @@ run:
 #     paths:
 #       - dist/*.whl
 
+
+docker:
+  tags:
+    - shell
+  stage: package
+  only:
+    - master
+  script:
+    - echo "package docker"
+    - docker info
+    - docker login -u echo0821 -p Lkq2mapp565688 registry.hub.docker.com
+    - docker build -t registry.hub.docker.com/echo0821/web-methodology:latest .
+    - docker push registry.hub.docker.com/echo0821/web-methodology:latest
+    - docker rmi registry.hub.docker.com/echo0821/web-methodology
+#    - docker tag registry.hub.docker.com/echo0821/web-project:latest registry.heroku.com/comp3019j-web-dev/web
+#    - docker push registry.heroku.com/comp3019j-web-dev/web
+
 # pages:
 #   script:
 #     - pip install sphinx sphinx-rtd-theme

Dockerfile

@@ -1,6 +1,7 @@
-FROM python:3.7.7
+FROM python:3.9.7
 COPY . /debugger
 WORKDIR /debugger
 RUN pip install -i https://pypi.tuna.tsinghua.edu.cn/simple -r requirements.txt
 ENTRYPOINT ["python"]
+EXPOSE 5000
 CMD ["flasky.py"]

app/__init__.py

@@ -28,7 +28,6 @@ login_manager = LoginManager()
 login_manager.login_view = 'auth.login'
 
 
-
 def create_app(config_name):
     app = Flask(__name__)
     app.config.from_object(config[config_name])
@@ -46,8 +45,6 @@ def create_app(config_name):
     flask_static_digest.init_app(app)
     admin.init_app(app)
 
-
-
     from .main import main as main_blueprint
     app.register_blueprint(main_blueprint)
 

flasky.py

@@ -22,7 +22,7 @@ from geetest_config import GEETEST_ID, GEETEST_KEY, REDIS_HOST, REDIS_PORT, CYCL
 
 from sdk.geetest_lib import GeetestLib
 
-
+geetest_dict = {}
 # 发送bypass请求，获取bypass状态并进行缓存
 def check_bypass_status():
     response = ""
@@ -42,6 +42,7 @@ def check_bypass_status():
     print("bypass状态已经获取并存入redis，当前状态为-{}".format(bypass_status))
     time.sleep(CYCLE_TIME)
 
+check_bypass_status()
 
 @app.shell_context_processor
 def make_shell_context():
@@ -49,7 +50,7 @@ def make_shell_context():
                 Comment=Comment, Like=Like, Notification=Notification, Transaction=Transaction, Activity=Activity)
 
 
-geetest_dict = {}
+
 
 
 # 从缓存中取出当前缓存的bypass状态(success/fail)
@@ -86,9 +87,9 @@ def favicon():
     return app.send_static_file('favicon.ico')
 
 
-thread = threading.Thread(target=check_bypass_status)
-thread.start()
-app.secret_key = GeetestLib.VERSION
+# thread = threading.Thread(target=check_bypass_status)
+# thread.start()
+# app.secret_key = GeetestLib.VERSION
 
 # User, Role, Students, Permission, Post, Comment, Like, Notification, Transaction, Activity
 admin.add_view(ModelView(User, db.session, name="Users", endpoint="users"))

requirements.txt

@@ -1,36 +1,46 @@
-alembic==1.4.2
+alembic==1.7.5
+arrow==1.2.1
+binaryornot==0.4.4
+bleach==3.1.4
 blinker==1.4
-click==7.1.1
+certifi==2021.10.8
+chardet==4.0.0
+charset-normalizer==2.0.8
+click==8.0.3
+cookiecutter==1.7.3
 dominate==2.5.1
 Faker==4.0.3
-Flask==0.12.2
+Flask==2.0.2
+Flask-Admin==1.5.8
 Flask-Bootstrap==3.3.7.1
+Flask-Caching==1.10.1
+Flask-DebugToolbar==0.11.0
 Flask-Login==0.5.0
 Flask-Mail==0.9.1
-Flask-Migrate==2.0.4
+Flask-Migrate==3.1.0
 Flask-Moment==0.9.0
 Flask-PageDown==0.2.2
-Flask-Script==2.0.6
-Flask-SQLAlchemy==2.4.1
+Flask-SQLAlchemy==2.5.1
+Flask-Static-Digest==0.2.1
 Flask-WTF==0.14.3
-itsdangerous==0.24
-Jinja2==2.11.2
-Mako==1.1.2
-MarkupSafe==1.1.1
-python-dateutil==2.8.1
-python-editor==1.0.4
-six==1.14.0
-SQLAlchemy~=1.3.16
+greenlet==1.1.2
+idna==3.3
+itsdangerous==2.0.1
+Jinja2==3.0.3
+jinja2-time==0.2.0
+Mako==1.1.6
+Markdown==3.2.1
+MarkupSafe==2.0.1
+poyo==0.5.0
+python-dateutil==2.8.2
+python-slugify==5.0.2
+requests==2.26.0
+six==1.16.0
+SQLAlchemy==1.4.27
 text-unidecode==1.3
+urllib3==1.26.7
 visitor==0.1.3
-Werkzeug==0.12.2
+webencodings==0.5.1
+Werkzeug==2.0.2
 WTForms==2.2
-
-bleach~=3.1.4
-Markdown~=3.2.1
-
-flask_caching
-flask_debugtoolbar
-flask_static_digest
-flask-admin
-wtforms_appengine
+WTForms-Appengine==0.1