Skip to content

Versions upgrade #570

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.

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

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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 Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM node:10 as build-stage
FROM node:14 as build-stage

WORKDIR /workspace/
COPY ./client /workspace/client

RUN npm install -g @vue/cli@3.3.0
RUN npm install -g @vue/cli-service@3.3.0
RUN npm install -g @vue/cli@3.12.1
RUN npm install -g @vue/cli-service@3.12.1

COPY ./client/package* /workspace/

2 changes: 1 addition & 1 deletion backend/Dockerfile
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ COPY ./backend/requirements.txt /workspace/

# Install python package dependices
RUN pip install -r requirements.txt && \
pip install gunicorn[eventlet]==19.9.0 && \
pip install gunicorn[eventlet]==21.1.0 && \
pip install pycocotools

# Install maskrcnn
12 changes: 6 additions & 6 deletions backend/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
eventlet==0.24.1
opencv-python==4.0.0.21
flask==1.0.2
flask-cors==3.0.7
eventlet==0.30.2
opencv-python==4.2.0.32
flask==1.1.2
flask-cors==3.0.9
flask-login==0.4.1
flask-restplus==0.12.1
flask-mongoengine==0.9.5
flask-mongoengine==1.0.0
numpy
cython
scikit-image
@@ -15,7 +15,7 @@ pytest==3.9.3
pytest-ordering==0.6
imantics==0.1.9
flask-socketio==3.3.2
celery==4.2.2
celery==5.1.2
Shapely==1.7.0
scipy
Pillow
6 changes: 3 additions & 3 deletions backend/workers/tasks/thumbnails.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
from database import ImageModel
from celery import task
from celery import shared_task


@task
@shared_task
def thumbnail_generate_single_image(image_id):
image = ImageModel.objects(id=image_id).first()
image.thumbnail()
image.flag_thumbnail(flag=False)


__all__ = ["thumbnail_generate_single_image"]
__all__ = ["thumbnail_generate_single_image"]
8 changes: 4 additions & 4 deletions client/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM node:10
FROM node:14

RUN npm install -g --quiet \
@vue/cli@3.3.0 \
@vue/cli-service@3.3.0
@vue/cli@3.12.1 \
@vue/cli-service@3.12.1

WORKDIR /workspace/

@@ -13,4 +13,4 @@ ENV NODE_PATH=/workspace/node_modules
WORKDIR /workspace/client/

EXPOSE 8080
CMD npm run serve
CMD npm run serve
18,035 changes: 17,889 additions & 146 deletions client/package-lock.json

Large diffs are not rendered by default.

42 changes: 21 additions & 21 deletions client/package.json
Original file line number Diff line number Diff line change
@@ -9,36 +9,36 @@
"test": "vue-cli-service test:unit"
},
"dependencies": {
"axios": "^0.18.0",
"bootstrap": "^4.1.3",
"intersection-observer": "^0.5.1",
"jquery": "^3.3.1",
"paper": "^0.11.8",
"popper.js": "^1.14.5",
"simplify-js": "^1.2.3",
"@popperjs/core": "^2.11.0",
"axios": "^0.21.4",
"bootstrap": "^4.5.0",
"intersection-observer": "^0.12.2",
"jquery": "^3.6.0",
"paper": "^0.12.15",
"simplify-js": "^1.2.4",
"toastr": "^2.1.4",
"v-lazy-image": "^1.3.2",
"v-tooltip": "^2.0.0-rc.33",
"vue": "^2.5.17",
"vue-loading-overlay": "^3.1.1",
"vue-router": "^3.0.2",
"vue-socket.io": "^3.0.5",
"v-lazy-image": "^1.4.0",
"v-tooltip": "^2.1.3",
"vue": "^2.6.14",
"vue-loading-overlay": "^3.4.2",
"vue-router": "^3.5.4",
"vue-socket.io": "^3.0.10",
"vue-touch": "^2.0.0-beta.4",
"vuex": "^3.0.1"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^3.1.1",
"@vue/cli-plugin-eslint": "^3.1.1",
"@vue/cli-plugin-unit-jest": "^3.4.0",
"@vue/cli-service": "^3.1.1",
"@vue/cli-plugin-babel": "^3.12.0",
"@vue/cli-plugin-eslint": "^3.12.0",
"@vue/cli-plugin-unit-jest": "^3.12.0",
"@vue/cli-service": "^3.12.0",
"@vue/eslint-config-prettier": "^4.0.0",
"@vue/test-utils": "^1.0.0-beta.20",
"@vue/test-utils": "^1.3.0",
"babel-core": "7.0.0-bridge.0",
"babel-eslint": "^10.0.1",
"babel-jest": "^24.1.0",
"eslint": "^5.8.0",
"eslint-plugin-vue": "^5.0.0-0",
"vue-template-compiler": "^2.5.17",
"eslint": "^5.16.0",
"eslint-plugin-vue": "^5.2.3",
"vue-template-compiler": "^2.6.14",
"vue-toastr-2": "0.0.10"
},
"eslintConfig": {