Skip to content

Commit 9704f80

Browse files
committed
try with submodules
1 parent 2d3e5cf commit 9704f80

File tree

3 files changed

+7
-17
lines changed

3 files changed

+7
-17
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@ jobs:
5151

5252
- name: Build and start Docker Compose services then run tests
5353
run: |
54-
./setup_github.sh &&
55-
docker-compose --profile baseServices up --build --no-deps -d &&
54+
./build_github.sh &&
5655
cd test && npm install && npx cypress run; docker ps
5756
5857
# - name: check dns is working

.gitmodules

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
[submodule "repo_refs/react1-app"]
22
path = repo_refs/react1-app
3-
url = ${FRONTEND_BUILD_CONTEXT}
3+
url = github.com/perfetti/react1-app.git
4+
branch = main
45
[submodule "repo_refs/react2-app"]
56
path = repo_refs/react2-app
6-
url = ${BACKEND_BUILD_CONTEXT}
7+
url = github.com/perfetti/react2-app.git
8+
branch = main
79
[submodule "repo_refs/rails-app"]
810
path = repo_refs/rails-app
9-
url = ${API_BUILD_CONTEXT}
11+
url = github.com/perfetti/rails-app.git
12+
branch = main

docker-compose.yaml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ services:
99
environment:
1010
- PUBLIC_URL=${FRONTEND_PUBLIC_URL}
1111
- WDS_SOCKET_PORT=${WDS_SOCKET_PORT}
12-
volumes:
13-
- ./repo_refs/react1-app:/app
1412
api:
1513
profiles: ["baseServices", "full"]
1614
build: ${API_BUILD_CONTEXT}
@@ -24,8 +22,6 @@ services:
2422
- DATABASE_HOST=${DATABASE_HOST}
2523
- DATABASE_USERNAME=${DATABASE_USERNAME}
2624
- RAILS_ENV=${RAILS_ENV}
27-
volumes:
28-
- ./repo_refs/rails-app:/app
2925
healthcheck:
3026
test: ["CMD", "curl", "-f", "http://localhost:3000/api/ping"]
3127
interval: 10s
@@ -45,8 +41,6 @@ services:
4541
- POSTGRES_USER=${POSTGRES_USER}
4642
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
4743
- POSTGRES_DB=${POSTGRES_DB}
48-
volumes:
49-
- ./postgres_data:/var/lib/postgresql/data
5044
healthcheck:
5145
test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER}"]
5246
interval: 10s
@@ -62,15 +56,11 @@ services:
6256
- WDS_SOCKET_PORT=${WDS_SOCKET_PORT}
6357
networks:
6458
- app-network
65-
volumes:
66-
- ./repo_refs/react2-app:/app
6759
nginx:
6860
profiles: ["baseServices", "full"]
6961
image: nginx:alpine
7062
ports:
7163
- 8089:80
72-
volumes:
73-
- ./nginx/default.conf:/etc/nginx/conf.d/default.conf
7464
depends_on:
7565
- api
7666
- frontend
@@ -88,8 +78,6 @@ services:
8878
build: ./test
8979
networks:
9080
- app-network
91-
volumes:
92-
- ./test:/app
9381
environment:
9482
- CYPRESS_BASE_URL=http://nginx:80
9583
depends_on:

0 commit comments

Comments
 (0)