pingu_98/cara
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

updated image class names

Browse source
This commit is contained in:
Luis Aleixo 2022-09-09 16:27:35 +02:00
parent f4ba8465ab
commit 94312d6569
4 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
.gitlab-ci.yml
View file

@ -84,6 +84,14 @@ check_openshift_config_prod:
OC_TOKEN: "${OPENSHIFT_CAIMIRA_PROD_CONFIG_CHECKER_TOKEN}"
oci_calculator:
extends: .image_builder
variables:
IMAGE_NAME: calculator
DOCKERFILE_DIRECTORY: app-config/cara-public-docker-image
DOCKER_CONTEXT_DIRECTORY: ""
# ###################################################################################################
# Build docker images
@ -157,6 +165,12 @@ link_caimira-webservice_with_gitlab_registry:
variables:
IMAGE_NAME: caimira-webservice
link_calculator_with_gitlab_registry:
extends:
- .link_docker_images_with_gitlab_registry
variables:
IMAGE_NAME: calculator
# ###################################################################################################
# Trigger build of CAiMIRA router on OpenShift

2
caimira/apps/templates/base/calculator.form.html.j2
View file

@ -24,7 +24,7 @@
<div class="container container--padding">
<div class="d-flex header-height">
<h1 class="align-self-center">Calculator</h1>
<img src="/static/images/cara_logo.200x200.png" class="logo_form align-self-center ml-3">
<img src="/static/images/caimira_logo.200x200.png" class="logo_form align-self-center ml-3">
</div>
</div>
</header>

2
caimira/apps/templates/base/calculator.report.html.j2
View file

@ -25,7 +25,7 @@
{% block report_header %}
<div id="report-header-div" class="d-flex flex-row" style="margin: 1%">
<a href="/" class="align-self-center"><img id="report_logo" src="/static/images/cara_logo.200x200.png" class="d-inline-block align-middle mr-3"></a>
<a href="/" class="align-self-center"><img id="report_logo" src="/static/images/caimira_logo.200x200.png" class="d-inline-block align-middle mr-3"></a>
<div style="margin-right: -105px" class='align-self-center mr-auto'>
<h2 class="header_text mb-0"><a href="{{ permalink.shortened }}" style="color: #2f4858">REPORT - {{ form.simulation_name }}</a></h2>
<p class="mb-0" id="report_version"> Created {{ creation_date }} using CAiMIRA calculator version v{{ form.calculator_version }}</p>

2
caimira/apps/templates/base/index.html.j2
View file

@ -30,7 +30,7 @@
</div>
</div>
<div class="align-self-center">
<img src="static/images/CAiMIRA_1_Vs3_Colour.jpg" class="cara_home_image">
<img src="static/images/CAiMIRA_1_Vs3_Colour.jpg" class="caimira_home_image">
</div>
</div>
<br>