From 638d98dde4933339636bf22691b51f9a27b50aa2 Mon Sep 17 00:00:00 2001 From: clouless Date: Fri, 29 Mar 2019 15:58:25 +0100 Subject: [PATCH] v31 upate tools. add ffmpeg for videorecording of testcafe e2e --- Dockerfile | 8 ++++---- README.md | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4566657..64d140d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,16 +3,16 @@ FROM cloutainer/k8s-jenkins-slave-base:v21 # # BASE PACKAGES # -RUN apt-get -qqy update \ +RUN rm -rf /var/lib/apt/lists/* /var/cache/apt/* && \ + apt-get -qqy update \ && apt-get -qqy --no-install-recommends install \ xvfb \ pulseaudio \ + ffmpeg \ g++ \ build-essential \ dbus \ - phantomjs \ - dbus-x11 && \ - rm -rf /var/lib/apt/lists/* /var/cache/apt/* + dbus-x11 # # NODEJS diff --git a/README.md b/README.md index 64a1d0c..f019c44 100644 --- a/README.md +++ b/README.md @@ -14,10 +14,10 @@ Kubernetes Docker image providing Jenkins Slave JNLP with Node.JS, xvfb and Goog | tool | version | |------|---------| -| yarn | 1.13.0 | -| node.js | 10.15.0 | +| yarn | 1.15.2 | +| node.js | 10.15.3 | | npm | 6.4.1 | -| google-chrome-stable | 71 | +| google-chrome-stable | 73.0.3683.86 | | phantomjs | apt-get | | Xvfb | apt-get | | git | apt-get | @@ -34,14 +34,14 @@ Use with [Kubernetes Jenkins Plugin](https://github.com/jenkinsci/kubernetes-plu ```groovy podTemplate( - name: 'nodejs-xvfb-chrome-v29', - label: 'k8s-jenkins-slave-nodejs-xvfb-chrome-v29', + name: 'nodejs-xvfb-chrome-v31', + label: 'k8s-jenkins-slave-nodejs-xvfb-chrome-v31', cloud: 'mycloud', nodeSelector: 'failure-domain.beta.kubernetes.io/zone=eu-west-1a', containers: [ containerTemplate( name: 'jnlp', - image: 'cloutainer/k8s-jenkins-slave-nodejs-xvfb-chrome:v29', + image: 'cloutainer/k8s-jenkins-slave-nodejs-xvfb-chrome:v31', privileged: false, command: '/opt/docker-entrypoint.sh', args: '', @@ -54,7 +54,7 @@ podTemplate( ) ] ) { - node('k8s-jenkins-slave-nodejs-xvfb-chrome-v29') { + node('k8s-jenkins-slave-nodejs-xvfb-chrome-v31') { stage('build and test') { sh 'mvn -version' sh 'git clone https://github.com/clouless/angular-4-unit-test-dummy.git'