fix(Jenkinsfile) update agent label from master to docker

Author: leJsboureau

Jenkinsfile

@@ -1,62 +1,93 @@
+
+def debianBuildDockerImage
+String dockerArgs = '-v  /var/run/docker.sock:/var/run/docker.sock --userns host --privileged -v $HOME:$HOME -e "HOME=${HOME}'
+
 pipeline {
-    agent {label 'master'}
+    agent { label "docker" }
     options { disableConcurrentBuilds() }
     environment {
         PROJECTNAME = "iink-js ${env.BRANCH_NAME}"
         PROJECTHOME = '/tmp/iink-js'
-        PROJECT_DIR= "${WORKSPACE.replace('/var/jenkins_home/workspace','/dockervolumes/cloud/master/jenkins/workspace')}"
+        PROJECT_DIR = "${WORKSPACE.replace('/var/jenkins_home/workspace','/dockervolumes/cloud/master/jenkins/workspace')}"
         APPLICATION_KEY = credentials('APPLICATION_KEY')
         HMAC_KEY =  credentials('HMAC_KEY')
-        MAKE_ARGS=" PROJECT_DIR=${env.PROJECT_DIR} HOME=${env.PROJECTHOME} BUILDID=${env.BUILD_NUMBER} DEV_APPLICATIONKEY=${env.APPLICATION_KEY} DEV_HMACKEY=${env.HMAC_KEY} "
+        MAKE_ARGS =" PROJECT_DIR=${env.PROJECT_DIR} HOME=${env.PROJECTHOME} BUILDID=${env.BUILD_NUMBER} DEV_APPLICATIONKEY=${env.APPLICATION_KEY} DEV_HMACKEY=${env.HMAC_KEY} "
     }
 
     stages {
 
-      stage ('purge'){
+      stage('Build docker builder') {
         steps {
-          sh "make ${env.MAKE_ARGS} purge"
+          script {
+            debianBuildDockerImage = docker.build("iink-js.debian-builder:${env.BUILD_ID}",  '-f ./docker/builder/Dockerfile ./')
+          }
         }
       }
 
-      stage ('prepare'){
+      stage ('purge'){
         steps {
-          sh "make ${env.MAKE_ARGS} prepare"
+          script {
+            debianBuildDockerImage.inside(dockerArgs) {
+              sh "make ${env.MAKE_ARGS} purge"
+            }
+          }
         }
       }
 
-      stage ('docker'){
+      stage ('prepare'){
         steps {
-          sh "make ${env.MAKE_ARGS} docker"
+          script {
+            debianBuildDockerImage.inside(dockerArgs) {
+              sh "make ${env.MAKE_ARGS} prepare"
+              sh "make ${env.MAKE_ARGS} docker-wait-tcp"
+            }
+          }
         }
       }
 
       stage ('init_examples'){
         steps {
-          sh "make ${env.MAKE_ARGS} init_examples"
+          script {
+            debianBuildDockerImage.inside(dockerArgs) {
+              sh "make ${env.MAKE_ARGS} docker-examples init_examples"
+            }
+          }
         }
       }
 
-      stage('test browser') {
+      stage('test browser with legacy server') {
 
         failFast false
 
         parallel {
-          
+
           stage ('test-chromium'){
             steps {
-              sh "BROWSER=chromium make ${env.MAKE_ARGS} test-e2e"
+              script {
+                debianBuildDockerImage.inside(dockerArgs) {
+                  sh "BROWSER=chromium make ${env.MAKE_ARGS} test-e2e"
+                }
+              }
             }
           }
 
           stage ('test-webkit'){
             steps {
-              sh "BROWSER=webkit make ${env.MAKE_ARGS} test-e2e"
+              script {
+                debianBuildDockerImage.inside(dockerArgs) {
+                  sh "BROWSER=webkit make ${env.MAKE_ARGS} test-e2e"
+                }
+              }
             }
           }
 
           stage ('test-firefox'){
             steps {
-              sh "BROWSER=firefox make ${env.MAKE_ARGS} test-e2e"
+              script {
+                debianBuildDockerImage.inside(dockerArgs) {
+                  sh "BROWSER=firefox make ${env.MAKE_ARGS} test-e2e"
+                }
+              }
             }
           }
         }
@@ -65,7 +96,11 @@ pipeline {
 
       stage ('audit'){
           steps {
-            sh "npm audit --production"
+            script {
+              debianBuildDockerImage.inside(dockerArgs) {
+                sh "npm audit --production"
+              }
+            }
           }
       }
     }

Makefile

@@ -20,7 +20,10 @@ build: clean ## Building the dist files from sources.
 docs: ## Building the doc files from sources.
 	@npm run docs
 
-docker: build ## Build the docker image containing last version of myscript-js and examples.
+docker-wait-tcp:
+	@cd docker/wait-tcp/ && docker build -t $(WAITTCP_DOCKERREPOSITORY) .
+
+docker-examples: build ## Build the docker image containing last version of myscript-js and examples.
 	@rm -rf docker/examples/delivery/
 	@mkdir -p docker/examples/delivery
 	@cp -R dist docker/examples/delivery/
@@ -29,13 +32,14 @@ docker: build ## Build the docker image containing last version of myscript-js a
 	@cd docker/examples/ && \
 		docker build \
 		--build-arg applicationkey=${DEV_APPLICATIONKEY} \
-		--build-arg hmackey=${DEV_HMACKEY} $(DOCKER_PARAMETERS) -t $(EXAMPLES_DOCKERREPOSITORY) .
+		--build-arg hmackey=${DEV_HMACKEY} \
+		-t $(EXAMPLES_DOCKERREPOSITORY) .
 
 killdocker:
 	@docker ps -a | grep "iinkjs-$(DOCKERTAG)-$(BUILDENV)-" | awk '{print $$1}' | xargs -r docker rm -f 2>/dev/null 1>/dev/null || true
 
 
-local-test-e2e: init_examples
+local-test-e2e: docker-examples init_examples
 	@$(MAKE) BROWSER=$(BROWSER) test-e2e
 
 test-e2e: 
@@ -53,9 +57,7 @@ test-e2e:
 		--name "playwright-$(BROWSER)-$(BUILDID)" mcr.microsoft.com/playwright:v1.16.0 \
 		yarn test:e2e
 
-dev-all: dev-examples ## Launch all the requirements for launching tests.
-
-dev-examples: init_examples ## Launch a local nginx server to ease development.
+dev-test: docker-examples init_examples ## Launch all the requirements for launching tests
 
 _launch_examples:
 	@echo "Starting examples container!"
@@ -67,13 +69,15 @@ _launch_examples:
 		-e "HMACKEY=$(DEV_HMACKEY)" \
 		$(DOCKER_EXAMPLES_PARAMETERS) \
 		--name $(TEST_DOCKER_EXAMPLES_INSTANCE_NAME) $(EXAMPLES_DOCKERREPOSITORY)
+
 _check_examples: 
 	@docker run --rm \
 		--link $(TEST_DOCKER_EXAMPLES_INSTANCE_NAME):WAITHOST \
 		-e "WAIT_PORT=$(EXAMPLES_LISTEN_PORT)" \
 		-e "WAIT_SERVICE=Test examples" \
 		$(WAITTCP_DOCKERREPOSITORY)
 	@echo "Examples started!"
+
 init_examples: _launch_examples _check_examples
 
 help: ## This help.

Makefile.inc

@@ -29,9 +29,9 @@ REGISTRY = registry.corp.myscript.com:5000
 DOC_DOCKERREPOSITORY = $(REGISTRY)/iinkjs-docs:$(DOCKERTAG)
 EXAMPLES_DOCKERREPOSITORY = $(REGISTRY)/iinkjs-examples:$(DOCKERTAG)
 
-CONFIGURATION_DOCKERTAG := master
-MOCHA_DOCKERREPOSITORY = $(REGISTRY)/myscript-webcomponents-mocha:$(CONFIGURATION_DOCKERTAG)
-WAITTCP_DOCKERREPOSITORY = $(REGISTRY)/myscript-webcomponents-wait-tcp:$(CONFIGURATION_DOCKERTAG)
+CONFIGURATION_DOCKERTAG := 1.0.0
+MOCHA_DOCKERREPOSITORY = $(REGISTRY)/iink-js-mocha:$(CONFIGURATION_DOCKERTAG)
+WAITTCP_DOCKERREPOSITORY = $(REGISTRY)/iink-js-wait-tcp:$(CONFIGURATION_DOCKERTAG)
 
 BUILDENV := test
 TEST_DOCKER_NAME_PREFIX := iinkjs-$(DOCKERTAG)-$(BUILDENV)-$(BUILDID)
@@ -54,13 +54,6 @@ ifeq ($(IINKAPILOCAL),true)
    APISCHEME := http
 endif
 
-
-ifeq ($(OFFLINE),true)
-    NPM_PARAMETERS := --cache-min 9999999
-else
-    DOCKER_PARAMETERS := --pull
-endif
-
 ifeq ($(DEVLOCAL),true)
     DOCKER_EXAMPLES_PARAMETERS := --net=host --userns=host
     EXAMPLES_LISTEN_PORT := 8080

docker/builder/Dockerfile

@@ -0,0 +1,5 @@
+FROM debian:bullseye-slim
+ENV DEBIAN_FRONTEND noninteractive
+RUN apt update -yyq;
+RUN apt install make npm yarn git curl -yyq
+RUN curl -fsSL https://get.docker.com -o get-docker.sh && sh ./get-docker.sh

docker/wait-tcp/Dockerfile

@@ -0,0 +1,13 @@
+FROM debian:buster-slim
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt update -yy;apt install -yy curl jq netcat-openbsd;rm -rf /var/lib/apt/* /var/cache/apt/*
+
+ENV WAIT_SERVICE "Undef"
+ENV WAIT_PORT 80
+ENV WAIT_HOST WAITHOST
+ENV TIMEOUT 90
+ENV DEBUG false
+ADD /entrypoint.sh /entrypoint.sh
+
+ENTRYPOINT ["/entrypoint.sh"]

docker/wait-tcp/entrypoint.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+if [ ${DEBUG} != "false" ]; then
+  set -xve
+fi
+
+echo -n "   => Waiting for ${WAIT_SERVICE} on tcp Port ${WAIT_PORT}"
+CPT=0
+while ! nc -z -w 1 ${WAIT_HOST} ${WAIT_PORT}; do
+  ((CPT++))
+  if [ ${CPT} -gt ${TIMEOUT} ]; then
+    echo " Timeout!"
+    exit 1
+  fi;
+  sleep 1
+  echo -n .
+done
+echo " Found!"