Unverified Commit 34e576f5 authored by Florent Chehab's avatar Florent Chehab
Browse files

feat(front): updated docker image & deps => v2.0.0

* slight update to Dockerfile
* node 12
* slight update to how deps are restored on up
* all deps updated to latest
parent 5a245c03
......@@ -36,7 +36,7 @@ check_back:
check_front:
<<: *only-default
stage: check
image: registry.gitlab.utc.fr/rex-dri/rex-dri/frontend:v1.2.0
image: registry.gitlab.utc.fr/rex-dri/rex-dri/frontend:v2.0.0
before_script:
- cd frontend && cp -R /usr/src/deps/node_modules .
script:
......@@ -78,7 +78,7 @@ test_back:
test_frontend:
<<: *only-default
stage: test
image: registry.gitlab.utc.fr/rex-dri/rex-dri/frontend:v1.2.0
image: registry.gitlab.utc.fr/rex-dri/rex-dri/frontend:v2.0.0
before_script:
- cd frontend && cp -R /usr/src/deps/node_modules .
script:
......@@ -98,7 +98,7 @@ flake8:
eslint:
<<: *only-default
stage: lint
image: registry.gitlab.utc.fr/rex-dri/rex-dri/frontend:v1.2.0
image: registry.gitlab.utc.fr/rex-dri/rex-dri/frontend:v2.0.0
before_script:
- cd frontend && cp -R /usr/src/deps/node_modules .
script:
......
......@@ -68,11 +68,11 @@ services:
# Service to handle frontend live developpments and building
frontend:
# Get the image from the registry
image: registry.gitlab.utc.fr/rex-dri/rex-dri/frontend:v1.2.0
image: registry.gitlab.utc.fr/rex-dri/rex-dri/frontend:v2.0.0
# To use a locally built one, comment above, uncomment bellow.
# build: ./frontend
# On startup, we retrieve the dependencies from the image and start the developpement server
command: /bin/sh -c "cd frontend && cp -R /usr/src/deps/node_modules . && yarn dev"
command: /bin/sh -c "cd frontend && mv -f /usr/src/deps/node_modules/* ./node_modules/ && yarn dev"
volumes:
# "Copy" the repo to the workdir.
- .:/usr/src/app/
......
**/node_modules/
# pull official base image of node
FROM node:10.15.1-alpine
FROM node:12-alpine
ENV NODE_ENV = "DEV"
# we cache de dependencies in one location, so that we can reuse them easily
WORKDIR /usr/src/deps
COPY ./package.json ./package.json
COPY ./yarn.lock ./yarn.lock
RUN yarn install --network-timeout 1000000
COPY ./package.json ./yarn.lock ./
RUN yarn install --network-timeout 1000000 && yarn cache clean
# And prepare a clean workdir for the project
WORKDIR /usr/src/app
......@@ -19,33 +19,33 @@
"author": "",
"license": "BSD-2-Clause",
"private": true,
"browserslist": [
"defaults"
],
"husky": {
"hooks": {
"pre-commit": "pretty-quick --staged"
}
},
"browserslist": [
"defaults"
],
"dependencies": {
"@date-io/date-fns": "^1.3.9",
"@material-ui/core": "^4.4.0",
"@date-io/date-fns": "^2.6.1",
"@material-ui/core": "^4.9.14",
"@material-ui/icons": "^4.2.1",
"@material-ui/lab": "^4.0.0-alpha.13",
"@material-ui/lab": "^4.0.0-alpha.53",
"@material-ui/pickers": "^3.2.4",
"@material-ui/styles": "^4.3.3",
"@material-ui/styles": "^4.9.14",
"axios": "^0.19.0",
"core-js": "^3.2.1",
"date-fns": "^2.0.1",
"downshift": "^3.2.12",
"downshift": "^5.3.0",
"fuzzysort": "^1.1.4",
"keycode": "^2.2.0",
"lodash": "^4.17.15",
"mapbox-gl": "^1.3.0",
"notistack": "^0.8.9",
"notistack": "^0.9.13",
"prop-types": "^15.7.2",
"react": "^16.9.0",
"react-awesome-slider": "^1.0.1",
"react-awesome-slider": "^4.1.0",
"react-dom": "^16.9.0",
"react-mapbox-gl": "^4.6.0",
"react-markdown": "^4.1.0",
......@@ -53,7 +53,7 @@
"recompose": "^0.30.0",
"regenerator-runtime": "^0.13.3",
"typeface-roboto": "0.0.75",
"uuid": "^3.3.3"
"uuid": "^8.0.0"
},
"devDependencies": {
"@babel/core": "^7.5.5",
......@@ -62,36 +62,35 @@
"@babel/preset-react": "^7.0.0",
"autoprefixer": "^9.6.1",
"babel-eslint": "^10.0.3",
"babel-jest": "^24.9.0",
"babel-jest": "^26.0.1",
"babel-loader": "^8.0.6",
"copy-webpack-plugin": "^5.0.4",
"css-loader": "^3.2.0",
"eslint": "^6.3.0",
"eslint": "^7.0.0",
"eslint-config-airbnb": "^18.0.1",
"eslint-config-prettier": "^6.1.0",
"eslint-import-resolver-node": "^0.3.2",
"eslint-plugin-import": "^2.18.2",
"eslint-plugin-jest": "^22.16.0",
"eslint-plugin-jest": "^23.11.0",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-react": "^7.14.3",
"eslint-plugin-react-hooks": "^1.7.0",
"file-loader": "^4.2.0",
"husky": "^3.0.5",
"jest": "^24.9.0",
"eslint-plugin-react": "^7.20.0",
"eslint-plugin-react-hooks": "^4.0.2",
"file-loader": "^6.0.0",
"husky": "^4.2.5",
"jest": "^26.0.1",
"js-yaml-loader": "^1.2.2",
"mini-css-extract-plugin": "^0.8.0",
"mini-css-extract-plugin": "^0.9.0",
"node-sass": "^4.12.0",
"postcss-loader": "^3.0.0",
"prettier": "1.18.2",
"pretty-quick": "^1.11.1",
"raw-loader": "^3.1.0",
"prettier": "2.0.5",
"pretty-quick": "^2.0.1",
"raw-loader": "^4.0.1",
"react-hot-loader": "^4.12.12",
"react-lorem-component": "^0.13.0",
"react-script": "^2.0.5",
"sass-loader": "^8.0.0",
"webpack": "^4.39.3",
"webpack-bundle-analyzer": "^3.4.1",
"webpack-bundle-tracker": "^0.4.2-beta",
"webpack-bundle-tracker": "0.4.3",
"webpack-cli": "^3.3.7",
"webpack-dev-server": "^3.8.0",
"webpack-merge": "^4.2.2"
......
This diff is collapsed.
......@@ -39,8 +39,8 @@ services:
volumes: ["postgres_data_prod:/var/lib/postgresql/data/"]
frontend: # Will be killed as soon as the front is generated
image: registry.gitlab.utc.fr/rex-dri/rex-dri/frontend:v1.2.0
command: /bin/sh -c "cd frontend && cp -R /usr/src/deps/node_modules . && yarn build"
image: registry.gitlab.utc.fr/rex-dri/rex-dri/frontend:v2.0.0
command: /bin/sh -c "cd frontend && mv -f /usr/src/deps/node_modules/* ./node_modules/ && yarn build"
networks: []
volumes:
- ../:/usr/src/app/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment