Merge pull request #1462 from RSCArt/version-update

Updated various dependency and image versions
3 years ago · 8e4e76621b
9 changed files with 4239 additions and 5036 deletions
--- a/13
+++ b/13
@ -1,6 +1,6 @@
-ARG PYTHON_VERSION="3.8.6"
-ARG NODE_VERSION="13.7"
-FROM node:${NODE_VERSION}-alpine AS frontend-builder
+ARG PYTHON_VERSION="3.9.6-slim-buster"
+ARG NODE_VERSION="16.5-alpine3.14"
+FROM node:${NODE_VERSION} AS frontend-builder

 COPY frontend/ /frontend/
 WORKDIR /frontend
@ -12,7 +12,7 @@ RUN apk add -U --no-cache git python3 make g++ \
 && yarn build \
 && apk del --no-cache git make g++

-FROM python:${PYTHON_VERSION}-slim-buster AS backend-builder
+FROM python:${PYTHON_VERSION} AS backend-builder

 RUN apt-get update \
 && apt-get install -y --no-install-recommends \
@ -27,14 +27,15 @@ WORKDIR /tmp
 COPY Pipfile* /tmp/

 # hadolint ignore=DL3013
-RUN pip install --no-cache-dir -U pip pipenv==2020.11.15 \
+RUN pip install --upgrade pip \
+ && pip install --no-cache-dir --upgrade pipenv \
 && pipenv lock -r > /requirements.txt \
 && echo "psycopg2-binary==2.8.6" >> /requirements.txt \
 && echo "django-heroku==0.3.1" >> /requirements.txt \
 && pip install --no-cache-dir -r /requirements.txt \
 && pip wheel --no-cache-dir -r /requirements.txt -w /deps

-FROM python:${PYTHON_VERSION}-slim-buster AS runtime
+FROM python:${PYTHON_VERSION} AS runtime

 RUN useradd -ms /bin/sh doccano

--- a/backend/Dockerfile.dev
+++ b/backend/Dockerfile.dev
@ -1,5 +1,5 @@
-ARG PYTHON_VERSION="3.8.6"
-FROM python:${PYTHON_VERSION}-slim-buster
+ARG PYTHON_VERSION="3.9.6-slim-buster"
+FROM python:${PYTHON_VERSION}

 RUN apt-get update \
 && apt-get install -y --no-install-recommends \
@ -14,7 +14,8 @@ RUN apt-get update \
 WORKDIR /src
 COPY ./Pipfile* /src/

-RUN pip install --upgrade pip && pip install pipenv==2020.11.15 \
+RUN pip install --upgrade pip \
+    && pip install pipenv \
    && pipenv install --system --dev

 COPY tools/ /opt/bin/
--- a/backend/Dockerfile.prod
+++ b/backend/Dockerfile.prod
@ -1,5 +1,5 @@
-ARG PYTHON_VERSION="3.8.6"
-FROM python:${PYTHON_VERSION}-slim-buster
+ARG PYTHON_VERSION="3.9.6-slim-buster"
+FROM python:${PYTHON_VERSION}

 CMD ["python3"]

@ -20,7 +20,8 @@ RUN apt-get update \
    libpq-dev=11.* \
    unixodbc-dev=2.* \
    g++=4:* \
- && pip install --no-cache-dir pipenv==2020.11.15 \
+ && pip install --upgrade pip \
+ && pip install --no-cache-dir pipenv \
 && pipenv install --system --deploy \
 && pip uninstall -y pipenv virtualenv-clone virtualenv \
 && apt-get clean \
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@ -43,7 +43,7 @@ services:
      - network-backend

  rabbitmq:
-    image: rabbitmq:3.8
+    image: rabbitmq:3.8-alpine
    environment:
      RABBITMQ_DEFAULT_USER: "${RABBITMQ_DEFAULT_USER}"
      RABBITMQ_DEFAULT_PASS: "${RABBITMQ_DEFAULT_PASS}"
@ -53,7 +53,7 @@ services:
      - network-backend

  frontend:
-    image: node:13.7.0
+    image: node:16.5-alpine3.14
    command: ["/src/tools/dev-nuxt.sh"]
    working_dir: /src/frontend
    environment:
@ -69,7 +69,7 @@ services:
      - network-frontend

  postgres:
-    image: postgres:13.1-alpine
+    image: postgres:13.3-alpine
    volumes:
      - postgres_data:/var/lib/postgresql/data/
    environment:
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@ -40,7 +40,7 @@ services:
      - network-backend

  rabbitmq:
-    image: rabbitmq:3.8
+    image: rabbitmq:3.8-alpine
    environment:
      RABBITMQ_DEFAULT_USER: "${RABBITMQ_DEFAULT_USER}"
      RABBITMQ_DEFAULT_PASS: "${RABBITMQ_DEFAULT_PASS}"
@ -67,7 +67,7 @@ services:
      - network-frontend

  postgres:
-    image: postgres:13.1-alpine
+    image: postgres:13.3-alpine
    volumes:
      - postgres_data:/var/lib/postgresql/data/
    environment:
--- a/frontend/nuxt.config.js
+++ b/frontend/nuxt.config.js
@ -2,7 +2,7 @@ import colors from 'vuetify/es5/util/colors'
 import i18n from './i18n'

 export default {
-  mode: 'spa',
+  ssr: false,
  /*
  ** Headers of the page
  */
--- a/frontend/package.json
+++ b/frontend/package.json
@ -15,61 +15,72 @@
    "generate": "nuxt generate"
  },
  "dependencies": {
-    "@nuxtjs/axios": "^5.12.0",
-    "@nuxtjs/composition-api": "^0.23.4",
-    "@nuxtjs/proxy": "^2.0.1",
-    "@nuxtjs/vuetify": "^1.11.2",
-    "@toast-ui/vue-editor": "^1.1.1",
+    "axios": "^0.21.1",
+    "@nuxt/webpack": "^2.15.*",
+    "@nuxtjs/axios": "^5.13.6",
+    "@nuxtjs/composition-api": "^0.25.0",
+    "@nuxtjs/proxy": "^2.1.0",
+    "@nuxtjs/vuetify": "^1.*",
+    "@nuxt/vue-app": "^2.15.7",
+    "nuxt": "^2.15.7",
+    "nuxt-i18n": "^6.27.3",
+    "fs-extra": "10.0.0",
+    "@toast-ui/vue-editor": "^2.5.3",
    "@vuejs-community/vue-filter-date-format": "^1.6.3",
    "@vuejs-community/vue-filter-date-parse": "^1.1.6",
-    "chart.js": "^2.9.3",
-    "codemirror": "^5.55.0",
-    "filepond": "^4.26.1",
+    "consola": "^2.15.3",
+    "chart.js": "^2.*",
+    "codemirror": "^5.*",
+    "filepond": "^4.28.2",
    "filepond-plugin-file-validate-type": "^1.2.6",
    "js-cookie": "^2.2.1",
    "lodash": "^4.17.21",
-    "nuxt": "^2.11.0",
-    "nuxt-i18n": "^6.13.12",
-    "papaparse": "^5.2.0",
+    "papaparse": "^5.3.1",
    "tui-editor": "^1.4.10",
-    "vue-chartjs": "^3.5.0",
-    "vue-filepond": "^6.0.0",
+    "vue": "^2.6.14",
+    "vue-chartjs": "^3.5.1",
+    "vue-filepond": "^6.0.3",
    "vue-shortkey": "^3.1.7",
+    "vue-template-compiler": "^2.6.14",
    "vue-youtube": "^1.4.0",
-    "vuetify": "^2.3.4",
-    "wavesurfer.js": "^5.0.1",
-    "yarn": "^1.22.4"
+    "vuetify": "^2.*",
+    "wavesurfer.js": "^5.1.0",
+    "webpack": "^4.46.0",
+    "ts-loader": "^8.3.0",
+    "yarn": "^1.22.10"
  },
  "devDependencies": {
-    "@nuxt/types": "^2.14.12",
-    "@nuxt/typescript-build": "^2.0.4",
-    "@nuxtjs/eslint-config": "^3.0.0",
-    "@nuxtjs/eslint-config-typescript": "^5.0.0",
+    "@nuxt/types": "^2.15.7",
+    "@nuxt/typescript-build": "^2.1.0",
+    "@nuxtjs/eslint-config": "^6.0.1",
+    "@nuxtjs/eslint-config-typescript": "^6.0.1",
    "@nuxtjs/eslint-module": "^2.0.0",
-    "@nuxtjs/google-analytics": "^2.3.0",
-    "@types/lodash": "^4.14.168",
-    "@types/wavesurfer.js": "^5.0.1",
-    "@vue/test-utils": "^1.0.3",
-    "axios-mock-adapter": "^1.18.1",
-    "babel-core": "7.0.0-bridge.0",
-    "babel-eslint": "^10.1.0",
-    "babel-jest": "^26.1.0",
-    "eslint": "^7.19.0",
-    "eslint-config-prettier": "^7.2.0",
-    "eslint-config-standard": ">=14.1.1",
-    "eslint-plugin-import": ">=2.22.0",
-    "eslint-plugin-jest": ">=23.18.0",
-    "eslint-plugin-node": ">=11.1.0",
-    "eslint-plugin-nuxt": "^1.0.0",
-    "eslint-plugin-promise": ">=4.0.1",
-    "eslint-plugin-standard": ">=4.0.1",
-    "eslint-plugin-vue": "^6.2.2",
-    "jest": "^26.1.0",
-    "nodemon": "^2.0.4",
-    "prettier": "^2.2.1",
+    "@nuxtjs/google-analytics": "^2.4.0",
+    "@types/lodash": "^4.14.171",
+    "@types/wavesurfer.js": "^5.1.0",
+    "@vue/test-utils": "^1.2.2",
+    "axios-mock-adapter": "^1.19.0",
+    "typescript": "^4.3.5",
+    "@babel/core": "^7.14.8",
+    "babel-core": "^6.26.3",
+    "@babel/eslint-parser": "^7.14.7",
+    "babel-jest": "^27.0.6",
+    "eslint": "^7.31.0",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-config-standard": "^16.0.3",
+    "eslint-plugin-import": "^2.23.4",
+    "eslint-plugin-jest": "^24.4.0",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-nuxt": "^2.0.0",
+    "eslint-plugin-promise": "5.1.0",
+    "eslint-plugin-vue": "^7.14.0",
+    "jest": "^27.0.6",
+    "nodemon": "^2.0.12",
+    "prettier": "^2.3.2",
    "raw-loader": "^4.0.2",
-    "stylus": "^0.54.7",
-    "stylus-loader": "^3.0.2",
-    "vue-jest": "^3.0.6"
+    "stylus": "^0.54.8",
+    "stylus-loader": "^4.3.3",
+    "vue-jest": "^3.0.7",
+    "core-js": "^3.15.*"
  }
 }
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
--- a/nginx/Dockerfile
+++ b/nginx/Dockerfile
@ -1,5 +1,5 @@
-ARG NODE_VERSION="13.7"
-FROM node:${NODE_VERSION}-alpine AS frontend-builder
+ARG NODE_VERSION="16.5-alpine3.14"
+FROM node:${NODE_VERSION} AS frontend-builder

 COPY frontend/ /app/
 WORKDIR /app
@ -9,7 +9,7 @@ RUN apk add -U --no-cache git python3 make g++ \
  && yarn build \
  && apk del --no-cache git make g++

-FROM nginx:1.17.4-alpine AS runtime
+FROM nginx:1.21.1-alpine AS runtime

 RUN addgroup -g 61000 doccano \
  && adduser -G doccano -S doccano -u 61000