Browse Source

chore(action): docker compose command update

Signed-off-by: Pranav C <pranavxc@gmail.com>
pull/510/head
Pranav C 3 years ago
parent
commit
daa2bf8bcf
  1. 2
      cypress/support/commands.js
  2. 12
      docker-compose-cypress.yml
  3. 1
      packages/nc-gui/package.json

2
cypress/support/commands.js

@ -42,8 +42,6 @@ Cypress.Commands.add('openOrCreateRestProject', () => {
cy.get('input[type="text"]').type('pranavc@gmail.com'); cy.get('input[type="text"]').type('pranavc@gmail.com');
cy.get('input[type="password"]').type('Password123.'); cy.get('input[type="password"]').type('Password123.');
cy.get('button:contains("SIGN UP")').click() cy.get('button:contains("SIGN UP")').click()
// handle signin
} else { } else {
cy.get('input[type="text"]').type('pranavc@gmail.com'); cy.get('input[type="text"]').type('pranavc@gmail.com');
cy.get('input[type="password"]').type('Password123.'); cy.get('input[type="password"]').type('Password123.');

12
docker-compose-cypress.yml

@ -11,18 +11,19 @@ services:
- ./packages/nocodb/tests/mysql-sakila-db:/docker-entrypoint-initdb.d - ./packages/nocodb/tests/mysql-sakila-db:/docker-entrypoint-initdb.d
xc-cypress-nocodb: xc-cypress-nocodb:
network_mode: host network_mode: host
image: node:12.22.1-slim image: node:14-alpine
volumes: volumes:
- ./packages/nocodb:/home/app - ./packages/nocodb:/home/app
command: command:
- /bin/bash - /bin/sh
- -c - -c
- | - |
echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
cd /home/app/ && rm package-lock.json && npm i && npm run run rm /home/app/package-lock.json
cd /home/app/ && npm i && npm run run
xc-cypress-nc-gui: xc-cypress-nc-gui:
network_mode: host network_mode: host
image: node:12.22.1-slim image: node:14-alpine
environment: environment:
- HOST=0.0.0.0 - HOST=0.0.0.0
- PORT=3000 - PORT=3000
@ -30,9 +31,10 @@ services:
- ./packages/nc-gui:/home/app - ./packages/nc-gui:/home/app
- ./packages/nc-lib-gui:/home/nc-lib-gui - ./packages/nc-lib-gui:/home/nc-lib-gui
command: command:
- /bin/bash - /bin/sh
- -c - -c
- | - |
echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
apk --update --no-cache add git
rm /home/app/package-lock.json rm /home/app/package-lock.json
cd /home/app/ && npm i && npm run dev cd /home/app/ && npm i && npm run dev

1
packages/nc-gui/package.json

@ -64,7 +64,6 @@
"@nuxtjs/eslint-config": "^6.0.1", "@nuxtjs/eslint-config": "^6.0.1",
"@nuxtjs/vuetify": "^1.11.2", "@nuxtjs/vuetify": "^1.11.2",
"babel-eslint": "^10.1.0", "babel-eslint": "^10.1.0",
"cypress": "^7.3.0",
"eslint": "^7.31.0", "eslint": "^7.31.0",
"monaco-editor-webpack-plugin": "^1.9.1", "monaco-editor-webpack-plugin": "^1.9.1",
"sass": "~1.32.12", "sass": "~1.32.12",

Loading…
Cancel
Save