Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1b5df31a38 | |||
| 15a165eecc | |||
| 8945283aa8 | |||
| 7374de357a | |||
| bf3499eacc | |||
| 64ce8d4a8c |
@@ -7,9 +7,11 @@ REACT_APP_APPSITE=" https://myfitapp.mermsemr.com"
|
|||||||
#REACT_APP_APPSITE="http://localhost:7012"
|
#REACT_APP_APPSITE="http://localhost:7012"
|
||||||
|
|
||||||
|
|
||||||
REACT_APP_AUX_ENDPOINT="https://devapi.mermsemr.com/en/desktop/api/v2/myfit"
|
# REACT_APP_AUX_ENDPOINT="https://devapi.mermsemr.com/en/desktop/api/v2/myfit"
|
||||||
REACT_APP_USERS_ENDPOINT="https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
|
# REACT_APP_USERS_ENDPOINT="https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
|
||||||
# REACT_APP_PASSWORD_ENDPOINT="https://devapi.mermsemr.com/en/desktop/api/v2/myfituser/resetpass"
|
|
||||||
|
REACT_APP_AUX_ENDPOINT="https://api.myfit.ai/en/desktop/api/v2/myfit"
|
||||||
|
REACT_APP_USERS_ENDPOINT="https://api.myfit.ai/en/desktop/api/v2/myfituser"
|
||||||
|
|
||||||
REACT_APP_SESSION_EXPIRE_MINUTES=15
|
REACT_APP_SESSION_EXPIRE_MINUTES=15
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -7,8 +7,8 @@ REACT_APP_APPSITE=" https://myfitapp.mermsemr.com"
|
|||||||
#REACT_APP_APPSITE="http://localhost:7012"
|
#REACT_APP_APPSITE="http://localhost:7012"
|
||||||
|
|
||||||
|
|
||||||
REACT_APP_AUX_ENDPOINT="https://devapi.mermsemr.com/en/desktop/api/v2/myfit"
|
REACT_APP_AUX_ENDPOINT="https://devapi.myfit.ai/en/desktop/api/v2/myfit"
|
||||||
REACT_APP_USERS_ENDPOINT="https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
|
REACT_APP_USERS_ENDPOINT="https://devapi.myfit.ai/en/desktop/api/v2/myfituser"
|
||||||
# REACT_APP_PASSWORD_ENDPOINT="https://devapi.mermsemr.com/en/desktop/api/v2/myfituser/resetpass"
|
# REACT_APP_PASSWORD_ENDPOINT="https://devapi.mermsemr.com/en/desktop/api/v2/myfituser/resetpass"
|
||||||
|
|
||||||
REACT_APP_SESSION_EXPIRE_MINUTES=15
|
REACT_APP_SESSION_EXPIRE_MINUTES=15
|
||||||
|
|||||||
+2
-2
@@ -6,9 +6,9 @@ REACT_APP_TWITTER="https://twitter.com/fluxtra"
|
|||||||
REACT_APP_APPSITE=" https://myfitapp.mermsemr.com"
|
REACT_APP_APPSITE=" https://myfitapp.mermsemr.com"
|
||||||
#REACT_APP_APPSITE="http://localhost:7012"
|
#REACT_APP_APPSITE="http://localhost:7012"
|
||||||
|
|
||||||
|
REACT_APP_AUX_ENDPOINT="https://api.myfit.ai/en/desktop/api/v2/myfit"
|
||||||
|
REACT_APP_USERS_ENDPOINT="https://api.myfit.ai/en/desktop/api/v2/myfituser"
|
||||||
|
|
||||||
REACT_APP_AUX_ENDPOINT="https://api.mermsemr.com/en/desktop/api/v2/myfit"
|
|
||||||
REACT_APP_USERS_ENDPOINT="https://api.mermsemr.com/en/desktop/api/v2/myfituser"
|
|
||||||
# REACT_APP_PASSWORD_ENDPOINT="https://api.mermsemr.com/en/desktop/api/v2/myfituser/resetpass"
|
# REACT_APP_PASSWORD_ENDPOINT="https://api.mermsemr.com/en/desktop/api/v2/myfituser/resetpass"
|
||||||
|
|
||||||
REACT_APP_SESSION_EXPIRE_MINUTES=15
|
REACT_APP_SESSION_EXPIRE_MINUTES=15
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
build-job:
|
||||||
|
stage: build
|
||||||
|
script:
|
||||||
|
- echo "Hello, $GITLAB_USER_LOGIN!"
|
||||||
|
|
||||||
|
test-job1:
|
||||||
|
stage: test
|
||||||
|
script:
|
||||||
|
- echo "This job tests something"
|
||||||
|
|
||||||
|
test-job2:
|
||||||
|
stage: test
|
||||||
|
script:
|
||||||
|
- echo "This job tests something, but takes more time than test-job1."
|
||||||
|
- echo "After the echo commands complete, it runs the sleep command for 20 seconds"
|
||||||
|
- echo "which simulates a test that runs 20 seconds longer than test-job1"
|
||||||
|
- sleep 20
|
||||||
|
|
||||||
|
deploy-prod:
|
||||||
|
stage: deploy
|
||||||
|
script:
|
||||||
|
- echo "This job deploys something from the $CI_COMMIT_BRANCH branch."
|
||||||
|
environment: production
|
||||||
+3
-10
@@ -1,7 +1,7 @@
|
|||||||
version: '3'
|
version: '3'
|
||||||
services:
|
services:
|
||||||
users-myfit:
|
users-myfit:
|
||||||
image: registry.myfit.ai/users-myfit:latest
|
image: registry.chiefsoft.net/users-myfit:latest
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: docker/Dockerfile
|
dockerfile: docker/Dockerfile
|
||||||
@@ -17,17 +17,10 @@ services:
|
|||||||
- ./src/:/usr/src/app/src
|
- ./src/:/usr/src/app/src
|
||||||
- ./vendors/:/usr/src/app/vendors
|
- ./vendors/:/usr/src/app/vendors
|
||||||
extra_hosts:
|
extra_hosts:
|
||||||
- backend.wrenchboard.api.live:10.10.33.15
|
- api.myfit.ai:10.10.33.15
|
||||||
- backend.wrenchboard.api.test:10.10.33.15
|
- devapi.myfit.ai:10.10.33.15
|
||||||
# #- backend.wrenchboard.api.live:172.31.4.27
|
|
||||||
# #- backend.wrenchboard.api.test:10.20.30.27
|
|
||||||
- apigateway.wrenchboard.app.dev.fluxtra.net:10.20.30.19
|
|
||||||
- apigateway.wrenchboard.app.lotus.fluxtra.net:172.31.4.19
|
|
||||||
environment:
|
environment:
|
||||||
- CHOKIDAR_USEPOLLING=true
|
- CHOKIDAR_USEPOLLING=true
|
||||||
# volumes:
|
|
||||||
# - ./:/app
|
|
||||||
# - /app/node_modules
|
|
||||||
tty: true
|
tty: true
|
||||||
stdin_open: true
|
stdin_open: true
|
||||||
# working_dir: /app
|
# working_dir: /app
|
||||||
|
|||||||
Reference in New Issue
Block a user