Compare commits
7 Commits
Author | SHA1 | Date | |
---|---|---|---|
d098317331
|
|||
641565d8ff
|
|||
25d016c154
|
|||
39703dca22
|
|||
c06184d1b1
|
|||
1450c8fdd7
|
|||
72a3241286
|
@ -56,6 +56,7 @@ build-ui:
|
|||||||
- cd ui/hv2-ui
|
- cd ui/hv2-ui
|
||||||
- if [ "$CI_COMMIT_TAG" != "" ]; then
|
- if [ "$CI_COMMIT_TAG" != "" ]; then
|
||||||
sed -i -e 's/GITTAGVERSION/'"$CI_COMMIT_TAG"':'"$CI_COMMIT_SHORT_SHA"'/' ./src/app/navigation/navigation.component.html;
|
sed -i -e 's/GITTAGVERSION/'"$CI_COMMIT_TAG"':'"$CI_COMMIT_SHORT_SHA"'/' ./src/app/navigation/navigation.component.html;
|
||||||
|
sed -i -e 's,http://localhost:8080,https://api.hv.nober.de,' ./src/app/config.ts;
|
||||||
fi
|
fi
|
||||||
- npm install
|
- npm install
|
||||||
- ./node_modules/.bin/ng build --prod
|
- ./node_modules/.bin/ng build --prod
|
||||||
@ -97,6 +98,7 @@ dockerize-ui:
|
|||||||
- docker rm $CONTAINER_NAME || echo "container not existing, never mind"
|
- docker rm $CONTAINER_NAME || echo "container not existing, never mind"
|
||||||
- docker run -d --network docker-server
|
- docker run -d --network docker-server
|
||||||
--ip $CONTAINER_IP
|
--ip $CONTAINER_IP
|
||||||
|
$VOLUMEOPT
|
||||||
--name $CONTAINER_NAME
|
--name $CONTAINER_NAME
|
||||||
--restart always
|
--restart always
|
||||||
$IMAGE_NAME:$CI_COMMIT_TAG
|
$IMAGE_NAME:$CI_COMMIT_TAG
|
||||||
@ -108,6 +110,7 @@ deploy-api:
|
|||||||
IMAGE_NAME: ${CI_REGISTRY}/${CI_PROJECT_PATH}/api
|
IMAGE_NAME: ${CI_REGISTRY}/${CI_PROJECT_PATH}/api
|
||||||
CONTAINER_NAME: hv2-api
|
CONTAINER_NAME: hv2-api
|
||||||
CONTAINER_IP: 172.16.10.38
|
CONTAINER_IP: 172.16.10.38
|
||||||
|
VOLUMEOPT: -v hv2-api-conf:/opt/app/config
|
||||||
|
|
||||||
deploy-ui:
|
deploy-ui:
|
||||||
extends:
|
extends:
|
||||||
|
@ -3,10 +3,16 @@ from flask_cors import CORS
|
|||||||
|
|
||||||
# instantiate the webservice
|
# instantiate the webservice
|
||||||
app = connexion.App(__name__)
|
app = connexion.App(__name__)
|
||||||
app.add_api('openapi.yaml')
|
app.add_api('openapi.yaml', options = {"swagger_ui": False})
|
||||||
|
|
||||||
# CORSify it - otherwise Angular won't accept it
|
# CORSify it - otherwise Angular won't accept it
|
||||||
CORS(app.app)
|
CORS(app.app,
|
||||||
|
origins=[
|
||||||
|
"http://localhost:4200",
|
||||||
|
"https://base.hv.nober.de"
|
||||||
|
],
|
||||||
|
supports_credentials=True
|
||||||
|
)
|
||||||
|
|
||||||
# provide the webservice application to uwsgi
|
# provide the webservice application to uwsgi
|
||||||
application = app.app
|
application = app.app
|
||||||
|
Reference in New Issue
Block a user