Commit 1de9a168 authored by Henrik Tramberend's avatar Henrik Tramberend

Merge remote-tracking branch 'origin/master' into engine-public-url

parents 0f95ad5d d92274ff
......@@ -114,7 +114,7 @@ test:win:
- win
stage: test
script:
- '& stack test -j1'
- "& stack test -j1"
cache:
key: test-win
paths:
......@@ -124,7 +124,6 @@ test:win:
- job: build:win
interruptible: true
deploy:mac:
stage: deploy
image:
......@@ -173,6 +172,26 @@ deploy:linux:
interruptible: true
resource_group: deploy_linux
deploy:docker:
stage: deploy
tags:
- docker
image:
name: gcr.io/kaniko-project/executor:debug
entrypoint: [""]
script:
- echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
- /kaniko/executor --context=$CI_PROJECT_DIR --dockerfile=$CI_PROJECT_DIR/Dockerfile-prebuilt --verbosity=warn --destination=$CI_REGISTRY_IMAGE:latest
needs:
- job: build:linux
artifacts: true
rules:
- if: '$CI_COMMIT_REF_NAME == "master"'
when: always
- if: '$CI_COMMIT_REF_NAME =~ /^v\d\.\d\.\d-patching$/'
when: always
interruptible: true
deploy:win:
stage: deploy
image:
......
FROM ubuntu:focal as decker
#set the encoding on UTF-8, so the parser works correctly, german language is also added for umlaute
#source of fix: https://blog.mkowalski.net/2016/05/16/solving-locale-issues-with-docker-containers/
RUN apt-get update && apt-get install --reinstall -y locales && \
sed -i 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/' /etc/locale.gen && \
locale-gen de_DE.UTF-8
ENV LANG de_DE.UTF-8
ENV LANGUAGE de_DE
ENV LC_ALL de_DE.UTF-8
RUN dpkg-reconfigure --frontend noninteractive locales
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get -y install tzdata
RUN apt-get install -y \
graphviz \
gnuplot \
rsync \
unzip \
zip
COPY decker /usr/bin/decker
WORKDIR /decker
ENTRYPOINT ["decker"]
......@@ -1481,7 +1481,23 @@ let RevealWhiteboard = (function(){
description: 'Toggle Whiteboard' },
toggleWhiteboard );
for (let i = 0; i < 7; i++) {
Reveal.addKeyBinding( { keyCode: 49+i, key: String.fromCharCode(49+i),
description: 'Toggle Whiteboard' },
() => { selectPenColor(penColors[i]); } );
}
Reveal.addKeyBinding( { keyCode: 56, key: '8',
description: 'Toggle Whiteboard' },
() => { selectPenRadius(2); } );
Reveal.addKeyBinding( { keyCode: 57, key: '9',
description: 'Toggle Whiteboard' },
() => { selectPenRadius(4); } );
Reveal.addKeyBinding( { keyCode: 48, key: '0',
description: 'Toggle Whiteboard' },
() => { selectPenRadius(6); } );
return {
init: function() {
......
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