use docker-x64

Author: hors

cloud/jenkins/fluentbit_docker_build.groovy

@@ -2,16 +2,17 @@ void checkImageForDocker(String IMAGE_SUFFIX){
     try {
              withCredentials([usernamePassword(credentialsId: 'hub.docker.com', passwordVariable: 'PASS', usernameVariable: 'USER'), string(credentialsId: 'SNYK_ID', variable: 'SNYK_ID')]) {
                 sh """
+                    IMAGE_SUFFIX=${IMAGE_SUFFIX}
                     IMAGE_TAG=\$(echo ${IMAGE_SUFFIX} | sed 's^/^-^g; s^[.]^-^g;' | tr '[:upper:]' '[:lower:]')
                     IMAGE_NAME="fluentbit"
-                    PATH_TO_DOCKERFILE="/source/build/fluentbit"
+                    PATH_TO_DOCKERFILE="source/fluentbit"
 
                     sg docker -c "
                         set -e
                         docker login -u '${USER}' -p '${PASS}'
 
                         snyk container test --platform=linux/amd64 --exclude-base-image-vulns --file=./\${PATH_TO_DOCKERFILE}/Dockerfile \
-                            --severity-threshold=high --json-file-output=\${IMAGE_TAG}-report.json perconalab/\$IMAGE_NAME:\${IMAGE_TAG}
+                            --severity-threshold=high --json-file-output=\${IMAGE_TAG}-report.json perconalab/\$IMAGE_NAME:\${IMAGE_TAG}-logcollector
                     "
                 """
              }
@@ -56,24 +57,6 @@ void build(String IMAGE_PREFIX){
     }
 }
 
-void pushImageToDocker(String IMAGE_PREFIX){
-     withCredentials([usernamePassword(credentialsId: 'hub.docker.com', passwordVariable: 'PASS', usernameVariable: 'USER'), file(credentialsId: 'DOCKER_REPO_KEY', variable: 'docker_key')]) {
-        sh """
-            IMAGE_PREFIX=${IMAGE_PREFIX}
-            sg docker -c "
-                if [ ! -d ~/.docker/trust/private ]; then
-                    mkdir -p /home/ec2-user/.docker/trust/private
-                    cp "${docker_key}" ~/.docker/trust/private/
-                fi
-
-                docker login -u '${USER}' -p '${PASS}'
-                docker push perconalab/percona-xtradb-cluster-operator:${GIT_PD_BRANCH}-${IMAGE_PREFIX}
-                docker push perconalab/fluentbit:${GIT_PD_BRANCH}-${IMAGE_PREFIX}
-                docker logout
-            "
-        """
-    }
-}
 pipeline {
     parameters {
         string(
@@ -86,7 +69,7 @@ pipeline {
             name: 'GIT_PD_REPO')
     }
     agent {
-         label 'docker'
+         label 'docker-x64'
     }
     environment {
         PATH = "${WORKSPACE}/node_modules/.bin:$PATH" // Add local npm bin to PATH