Skip to content

Commit

Permalink
docker
Browse files Browse the repository at this point in the history
  • Loading branch information
Sophie committed Feb 17, 2023
1 parent dcd0248 commit 26f787d
Show file tree
Hide file tree
Showing 11 changed files with 34 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
defaults:
run:
working-directory: server
container: cypress/browsers:node12.18.3-chrome87-ff82
container: cypress/included:12.5.1
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down
7 changes: 7 additions & 0 deletions server/apps/frontend/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
FROM cypress/included:cypress-12.6.0-node-16.18.1-chrome-110.0.5481.96-1-ff-109.0-edge-110.0.1587.41-1 as base
WORKDIR /app
COPY package.json ./
COPY ./ ./
RUN npm install -g npm@8.19.3
RUN npm install
CMD ["npm", "run", "test:e2e"]
7 changes: 7 additions & 0 deletions server/apps/frontend/Dockerfile.cypress
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
FROM cypress/included:cypress-12.6.0-node-16.18.1-chrome-110.0.5481.96-1-ff-109.0-edge-110.0.1587.41-1 as base
WORKDIR /app
COPY package.json ./
COPY ./ ./
RUN npm install -g npm@8.19.3
RUN npm install
CMD ["npm", "run", "start:server:local"]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions server/apps/frontend/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
version: '12.5.1'
services:
front:
build: ./
environment:
- PORT=3000
cypress:

image: cypress/included:cypress-12.6.0-node-16.18.1-chrome-110.0.5481.96-1-ff-109.0-edge-110.0.1587.41-1
environment:
- CYPRESS_BASE_URL=http://front:3000
depends_on:
- front
command: "--browser chrome"
working_dir: /test
volumes:
- ./:/test
4 changes: 2 additions & 2 deletions server/apps/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"cypress": "^12.5.1",
"cypress-image-diff-js": "1.23.0",
"dotenv": "16.0.3",
"esbuild": "0.16.5",
"esbuild": "0.17.8",
"eslint": "8.32.0",
"eslint-config-airbnb": "19.0.4",
"eslint-config-airbnb-typescript": "17.0.0",
Expand All @@ -76,7 +76,7 @@
},
"cypress-cucumber-preprocessor": {
"stepDefinitions": [
"cypress/e2e/[filepath]/*.{js,ts}"
"cypress/e2e/**/*.{js,ts}"
]
}
}

0 comments on commit 26f787d

Please sign in to comment.