fix: execute docker

Author: Mikael-R

Dockerfile

@@ -0,0 +1,6 @@
+FROM node:14-slim
+WORKDIR /app
+
+COPY . .
+
+RUN yarn

cypress.config.js

@@ -0,0 +1,7 @@
+const { defineConfig } = require('cypress');
+
+module.exports = defineConfig({
+  e2e: {
+    baseUrl: 'http://localhost:3000',
+  },
+});

docker-compose.yml

@@ -1,15 +1,17 @@
-version: '3.7'
-
 services:
   web:
     container_name: password-generator-web
     build:
       context: .
       dockerfile: docker/app.dockerfile
+    ports:
+      - '3000:3000'
     environment:
       - PORT=3000
       - NODE_ENV=development
-      - CHOKIDAR_USEPOLLING=true
+    volumes:
+      - .:/app
+    restart: always
     network_mode: host
     stdin_open: true
     command: yarn start

docker/app.dockerfile

@@ -1,9 +1,6 @@
 FROM node:14-slim
-
 WORKDIR /app
 
-ENV PATH /app/node_modules/.bin:$PATH
-
-COPY . ./
+COPY . .
 
-RUN yarn install
+RUN yarn

docker/e2e.dockerfile

@@ -1,7 +1,8 @@
-FROM cypress/base
-
+FROM cypress/base:16
 WORKDIR /app
 
 COPY cypress.json ./
+COPY package.json .
 
-RUN npx cypress verify
+RUN yarn
+RUN npx cypress verify

package.json

@@ -5,6 +5,7 @@
   "dependencies": {
     "@password-generator/check-strength": "^2.0.4",
     "@password-generator/package": "latest",
+    "cypress": "5.0.0",
     "polished": "^3.6.7",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
@@ -24,7 +25,6 @@
     "@typescript-eslint/eslint-plugin": "^3.9.0",
     "@typescript-eslint/parser": "^3.9.0",
     "commitizen": "^4.1.2",
-    "cypress": "5.0.0",
     "cz-conventional-changelog": "^3.2.0",
     "eslint": "^6.6.0",
     "eslint-config-airbnb": "^18.2.0",

scripts/docker-compose-setup.sh

@@ -1 +1 @@
-docker-compose build 
+docker compose build

scripts/run-tests.sh

@@ -1 +1 @@
-docker-compose run e2e
+docker compose run e2e

scripts/start-server.sh

@@ -1,2 +1,2 @@
-docker-compose up -d web
-echo 'server running on http://localhost:3000'
+docker compose up -d web
+echo 'server running on http://localhost:3000'

tsconfig.json

@@ -1,14 +1,8 @@
 {
   "compilerOptions": {
     "target": "es5",
-    "lib": [
-      "dom",
-      "dom.iterable",
-      "esnext"
-    ],
-    "types": [
-      "cypress"
-    ],
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "types": ["cypress"],
     "allowJs": true,
     "skipLibCheck": true,
     "esModuleInterop": true,
@@ -22,8 +16,5 @@
     "jsx": "react",
     "isolatedModules": true
   },
-  "include": [
-    "src",
-    "cypress"
-  ]
+  "include": ["src/**/*", "cypress/**/*"]
 }