Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
3ae92c020c
|
|||
d098317331
|
|||
641565d8ff
|
@ -98,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
|
||||||
@ -109,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,7 +3,7 @@ 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,
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
[attr.role]="(isHandset$ | async) ? 'dialog' : 'navigation'"
|
[attr.role]="(isHandset$ | async) ? 'dialog' : 'navigation'"
|
||||||
[mode]="(isHandset$ | async) ? 'over' : 'side'"
|
[mode]="(isHandset$ | async) ? 'over' : 'side'"
|
||||||
[opened]="(isHandset$ | async) === false">
|
[opened]="(isHandset$ | async) === false">
|
||||||
<mat-toolbar>Menu</mat-toolbar>
|
<mat-toolbar *ngIf="authenticated">Menu</mat-toolbar>
|
||||||
<mat-nav-list>
|
<mat-nav-list>
|
||||||
<a mat-list-item href="/tenants">Meine Mieter/innen</a>
|
<a mat-list-item href="/tenants">Meine Mieter/innen</a>
|
||||||
</mat-nav-list><mat-divider></mat-divider><mat-nav-list>
|
</mat-nav-list><mat-divider></mat-divider><mat-nav-list>
|
||||||
|
Reference in New Issue
Block a user