Commit 52342a5f authored by jfriedli's avatar jfriedli
Browse files

Merge branch 'develop' into 'master'

Develop

See merge request !524
parents 02f2d68a 741864c3
Pipeline #62882 passed with stages
in 34 minutes and 12 seconds
......@@ -25,13 +25,13 @@ cache:
# Runnning E2E Test using docker compose and cypress
e2e_test:
image: docker:19.03.13
image: docker:20.10.5
stage: test
tags:
- mat-web-runner
retry: 2
services:
- docker:19.03.13-dind
- docker:20.10.5-dind
variables:
DOCKER_TLS_CERTDIR: "/certs"
before_script:
......@@ -82,7 +82,7 @@ build_frontend_with_placeholder_url:
# Publish the container in the registry
.container-build-template: &container-build-template
image: docker:19.03.13
image: docker:20.10.5
tags:
- mat-web-runner
cache:
......@@ -90,7 +90,7 @@ build_frontend_with_placeholder_url:
paths:
- node_modules/
services:
- docker:19.03.13-dind
- docker:20.10.5-dind
variables:
DOCKER_TLS_CERTDIR: "/certs"
before_script:
......@@ -130,9 +130,9 @@ renovate:
# Run a sast analysis over the container
container_sast:
stage: container_sast
image: docker:19.03.13
image: docker:20.10.5
services:
- docker:19.03.13-dind
- docker:20.10.5-dind
variables:
DOCKER_TLS_CERTDIR: "/certs"
allow_failure: true
......
# production container
FROM nginx:1.19.5-alpine
FROM nginx:1.19.8-alpine
LABEL maintainer="Mat2 Web Frontend Maintainer <jan.friedli@immerda.ch>"
......
// all icons taken from https://material.io/resources/icons
export default function getIconByMime (fileType) {
const defaultChoice = {
icon: 'any'
bgColor: '#5a5e69',
iconColor: 'white',
icon: 'description'
}
if (!fileType) return defaultChoice
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment