diff --git a/Dockerfile b/Dockerfile index d3227b8..78c956e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ RUN rm -rf /var/lib/apt/lists/* /var/cache/apt/* && \ # # NODEJS # -RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - && \ +RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - && \ apt-get update -qqy && apt-get -qqy install -y nodejs && \ rm -rf /var/lib/apt/lists/* /var/cache/apt/* diff --git a/README.md b/README.md index a216eca..33d2422 100644 --- a/README.md +++ b/README.md @@ -34,14 +34,14 @@ Use with [Kubernetes Jenkins Plugin](https://github.com/jenkinsci/kubernetes-plu ```groovy podTemplate( - name: 'nodejs-xvfb-chrome-v34', - label: 'k8s-jenkins-slave-nodejs-xvfb-chrome-v34', + name: 'nodejs-xvfb-chrome-v35', + label: 'k8s-jenkins-slave-nodejs-xvfb-chrome-v35', cloud: 'mycloud', nodeSelector: 'failure-domain.beta.kubernetes.io/zone=eu-west-1a', containers: [ containerTemplate( name: 'jnlp', - image: 'cloutainer/k8s-jenkins-slave-nodejs-xvfb-chrome:v34', + image: 'cloutainer/k8s-jenkins-slave-nodejs-xvfb-chrome:v35', privileged: false, command: '/opt/docker-entrypoint.sh', args: '', @@ -54,7 +54,7 @@ podTemplate( ) ] ) { - node('k8s-jenkins-slave-nodejs-xvfb-chrome-v34') { + node('k8s-jenkins-slave-nodejs-xvfb-chrome-v35') { stage('build and test') { sh 'mvn -version' sh 'git clone https://github.com/clouless/angular-4-unit-test-dummy.git' diff --git a/docker-entrypoint-hook.sh b/docker-entrypoint-hook.sh index 3512dcc..5894e78 100644 --- a/docker-entrypoint-hook.sh +++ b/docker-entrypoint-hook.sh @@ -2,6 +2,19 @@ set -e +# +# VERSION OUTPUT +# +VERSION_NODE=$(node -v) +echo "DOCKER-ENTRYPOINT-HOOK >> node version : "$VERSION_NODE +VERSION_YARN=$(yarn -v) +echo "DOCKER-ENTRYPOINT-HOOK >> yarn version : "$VERSION_YARN +VERSION_NPM=$(npm -v) +echo "DOCKER-ENTRYPOINT-HOOK >> npm version : "$VERSION_NPM +VERSION_CHROME=$(google-chrome --version) +echo "DOCKER-ENTRYPOINT-HOOK >> google-chrome version : "$VERSION_CHROME + + # # XVFB #