Skip to content

Commit

Permalink
Merge pull request #111 from Arquisoft/develop
Browse files Browse the repository at this point in the history
Más funcionalidad a master
  • Loading branch information
CANCI0 authored Apr 18, 2024
2 parents fc7a148 + 29fb894 commit a09b775
Show file tree
Hide file tree
Showing 77 changed files with 6,910 additions and 1,230 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ jobs:
- run: npm --prefix users/authservice test -- --coverage
- run: npm --prefix users/userservice test -- --coverage
- run: npm --prefix gatewayservice test -- --coverage
- run: npm --prefix statsservice test -- --coverage
- run: npm --prefix webapp test -- --coverage
- name: Analyze with SonarCloud
uses: sonarsource/sonarcloud-github-action@master
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@ jobs:
- run: npm --prefix users/userservice ci
- run: npm --prefix gatewayservice ci
- run: npm --prefix webapp ci
- run: npm --prefix statsservice ci
- run: npm --prefix questionservice ci
- run: npm --prefix users/authservice test -- --coverage
- run: npm --prefix users/userservice test -- --coverage
- run: npm --prefix gatewayservice test -- --coverage
- run: npm --prefix statsservice test -- --coverage
- run: npm --prefix webapp test -- --coverage
- name: Analyze with SonarCloud
uses: sonarsource/sonarcloud-github-action@master
Expand Down
1 change: 1 addition & 0 deletions debug.log
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
[0220/104149.273:ERROR:registration_protocol_win.cc(107)] CreateFile: El sistema no puede encontrar el archivo especificado. (0x2)
[0227/100625.318:ERROR:registration_protocol_win.cc(107)] CreateFile: El sistema no puede encontrar el archivo especificado. (0x2)
8 changes: 7 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ services:
- "27017:27017"
networks:
- mynetwork
restart: always

questionservice:
container_name: questionservice-${teamname:-defaultASW}
Expand All @@ -20,6 +21,7 @@ services:
- "8003:8003"
networks:
- mynetwork
restart: always

statsservice:
container_name: statsservice-${teamname:-defaultASW}
Expand All @@ -34,6 +36,7 @@ services:
- mynetwork
environment:
MONGODB_STATS_URI: mongodb://mongodb:27017/statsdb
restart: always

authservice:
container_name: authservice-${teamname:-defaultASW}
Expand All @@ -48,6 +51,7 @@ services:
- mynetwork
environment:
MONGODB_URI: mongodb://mongodb:27017/userdb
restart: always

userservice:
container_name: userservice-${teamname:-defaultASW}
Expand All @@ -62,6 +66,7 @@ services:
- mynetwork
environment:
MONGODB_URI: mongodb://mongodb:27017/userdb
restart: always

gatewayservice:
container_name: gatewayservice-${teamname:-defaultASW}
Expand All @@ -83,6 +88,7 @@ services:
QUESTION_SERVICE_URL: http://questionservice:8003
AUTH_SERVICE_URL: http://authservice:8002
USER_SERVICE_URL: http://userservice:8001
restart: always

webapp:
container_name: webapp-${teamname:-defaultASW}
Expand Down Expand Up @@ -113,7 +119,7 @@ services:
grafana:
image: grafana/grafana
container_name: grafana-${teamname:-defaultASW}
profiles: ["dev"]
profiles: ["dev", "prod"]
networks:
- mynetwork
volumes:
Expand Down
4 changes: 4 additions & 0 deletions docs/images/03-Business.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions docs/images/03-Technical.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions docs/images/05-Level1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit a09b775

Please sign in to comment.