Skip to content

Commit f398382

Browse files
matthias-goupilbotisSmile
authored andcommitted
draft
1 parent 73633e8 commit f398382

File tree

4 files changed

+18
-12
lines changed

4 files changed

+18
-12
lines changed

compose.ci.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
include:
2-
- compose.e2e.yml
31
services:
42

53
certbot:
@@ -32,4 +30,11 @@ services:
3230
context: ./docker/front
3331
target: gally_example_ci
3432
additional_contexts:
35-
front_src: ./front
33+
front_src: ./front
34+
35+
e2e:
36+
extends:
37+
file: ./compose.e2e.yml
38+
service: e2e
39+
environment:
40+
- CI=true

compose.e2e.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,3 @@ services:
1111
- proxy
1212
extra_hosts:
1313
- ${E2E_SERVER_NAME:-gally.e2e}:host-gateway
14-
volumes:
15-
- ./front/e2e/:/usr/src/app:rw,cached,z

compose.override.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
# Development environment override
2-
include:
3-
- compose.e2e.yml
42
services:
53

64
certbot:
@@ -62,3 +60,10 @@ services:
6260
environment:
6361
- PUBLIC_URL=https://${SERVER_NAME:-gally.localhost}/example
6462
- REACT_APP_API_URL=https://${SERVER_NAME:-gally.localhost}/${API_ROUTE_PREFIX:-api}
63+
64+
e2e:
65+
extends:
66+
file: ./compose.e2e.yml
67+
service: e2e
68+
volumes:
69+
- ./front/e2e/:/usr/src/app:rw,cached,z

docker/front/Dockerfile.e2e

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@ WORKDIR /usr/src/app
44

55
COPY ./front/e2e/ .
66

7-
RUN yarn install
7+
RUN yarn install --frozen-lockfile
88

9-
RUN npx playwright install chromium
9+
RUN npx playwright install chromium
1010
RUN npx playwright install-deps chromium
1111

12-
# CMD ["yarn", "test"]
13-
# CMD ["tail", "-f", "/dev/null"]
14-
CMD ["sleep", "infinity"]
12+
CMD ["sleep", "infinity"]

0 commit comments

Comments
 (0)