Skip to content
Snippets Groups Projects
Commit fb067b80 authored by Konstantin Schulz's avatar Konstantin Schulz
Browse files

switched CI to shell executor with docker integration

parent bebdfbf0
Branches main
No related tags found
No related merge requests found
Pipeline #10753 failed
......@@ -13,21 +13,21 @@ stages:
- test
- deploy
coverage:
image: node:10.19.0-stretch
# image: node:10.19.0-stretch
stage: test
script:
- apt update
- wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
- apt install -y ./google-chrome-stable_current_amd64.deb
- npm i -g @angular/cli
- npm install
# - docker-compose build
# - docker-compose run mc_frontend npm run test
- npm run test
# - apt update
# - wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
# - apt install -y ./google-chrome-stable_current_amd64.deb
# - npm i -g @angular/cli
# - npm install
- docker-compose build
- docker-compose run mc_frontend npm run test
# - npm run test
coverage: '/Statements.*?(\d+(?:\.\d+)?)%/'
tags:
- node
- npm
- angular
variables:
CHROME_BIN: chromium-browser
# variables:
# CHROME_BIN: chromium-browser
......@@ -6,6 +6,8 @@ services:
context: .
dockerfile: Dockerfile
command: nginx -g "daemon off;"
environment:
- CHROME_BIN=chromium-browser
ports:
- "8100:8100"
restart: always
......
{
"name": "mc_frontend",
"version": "1.6.4",
"version": "1.6.5",
"author": "Ionic Framework",
"homepage": "https://ionicframework.com/",
"scripts": {
......
......@@ -5,7 +5,7 @@
<ion-title>{{ 'MACHINA_CALLIDA' | translate }}</ion-title>
<ion-buttons slot="end">
<ion-button (click)="closeMenu(true)">
<ion-icon name="md-close-circle"></ion-icon>
<ion-icon name="close-circle"></ion-icon>
</ion-button>
</ion-buttons>
</ion-toolbar>
......
......@@ -11,7 +11,7 @@
<ion-title *ngIf="HelperService.applicationState | async as state">{{ state.currentSetup.currentAuthor?.name }}</ion-title>
<ion-buttons slot="end">
<ion-menu-button autoHide="false">
<ion-icon name="md-menu"></ion-icon>
<ion-icon name="menu"></ion-icon>
</ion-menu-button>
</ion-buttons>
</ion-toolbar>
......
......@@ -11,7 +11,7 @@
<ion-title>{{ 'AUTHOR_SELECT' | translate }}</ion-title>
<ion-buttons slot="end">
<ion-menu-button autoHide="false">
<ion-icon name="md-menu"></ion-icon>
<ion-icon name="menu"></ion-icon>
</ion-menu-button>
</ion-buttons>
</ion-toolbar>
......@@ -52,7 +52,7 @@
<ion-row>
<ion-col size="12">
<label>
<ion-icon name="md-search" class="search"></ion-icon>
<ion-icon name="search" class="search"></ion-icon>
<input type="search" (ngModelChange)="getAuthors($event.toString())"
placeholder="{{ 'AUTHOR_SEARCH' | translate }}" [(ngModel)]="currentSearchValue"/>
</label>
......
......@@ -14,7 +14,7 @@
</ion-buttons>
<ion-buttons slot="end">
<ion-menu-button autoHide="false">
<ion-icon name="md-menu"></ion-icon>
<ion-icon name="menu"></ion-icon>
</ion-menu-button>
</ion-buttons>
</ion-toolbar>
......
......@@ -11,7 +11,7 @@
<ion-title>{{ 'DOC_SOFTWARE' | translate }}</ion-title>
<ion-buttons slot="end">
<ion-menu-button autoHide="false">
<ion-icon name="md-menu"></ion-icon>
<ion-icon name="menu"></ion-icon>
</ion-menu-button>
</ion-buttons>
</ion-toolbar>
......
......@@ -14,7 +14,7 @@
</ion-buttons>
<ion-buttons slot="end">
<ion-menu-button autoHide="false">
<ion-icon name="md-menu"></ion-icon>
<ion-icon name="menu"></ion-icon>
</ion-menu-button>
</ion-buttons>
</ion-toolbar>
......
......@@ -14,7 +14,7 @@
</ion-buttons>
<ion-buttons slot="end">
<ion-menu-button autoHide="false">
<ion-icon name="md-menu"></ion-icon>
<ion-icon name="menu"></ion-icon>
</ion-menu-button>
</ion-buttons>
</ion-toolbar>
......
......@@ -14,7 +14,7 @@
</ion-buttons>
<ion-buttons slot="end">
<ion-menu-button autoHide="false">
<ion-icon name="md-menu"></ion-icon>
<ion-icon name="menu"></ion-icon>
</ion-menu-button>
</ion-buttons>
</ion-toolbar>
......
......@@ -11,7 +11,7 @@
<ion-title>{{ 'VOCABULARY_CHECK' | translate }}</ion-title>
<ion-buttons slot="end">
<ion-menu-button autoHide="false">
<ion-icon name="md-menu"></ion-icon>
<ion-icon name="menu"></ion-icon>
</ion-menu-button>
</ion-buttons>
</ion-toolbar>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment