From 7d9f460a9ceaa5f48e84fc0122bc5bb3883ac0b1 Mon Sep 17 00:00:00 2001
From: Brian Seeders <brian.seeders@elastic.co>
Date: Wed, 18 Nov 2020 11:17:41 -0500
Subject: [PATCH] [CI] Build docker image during packer_cache (#82145)

---
 .ci/build_docker.sh            | 10 ++++++++++
 .ci/packer_cache_for_branch.sh |  2 ++
 vars/kibanaPipeline.groovy     |  7 +------
 3 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100755 .ci/build_docker.sh

diff --git a/.ci/build_docker.sh b/.ci/build_docker.sh
new file mode 100755
index 00000000000000..1f45182aad8408
--- /dev/null
+++ b/.ci/build_docker.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -euo pipefail
+
+cd "$(dirname "${0}")"
+
+cp /usr/local/bin/runbld ./
+cp /usr/local/bin/bash_standard_lib.sh ./
+
+docker build -t kibana-ci -f ./Dockerfile .
diff --git a/.ci/packer_cache_for_branch.sh b/.ci/packer_cache_for_branch.sh
index b8b5f7d3c3f0ea..0d9b22b04dbd0d 100755
--- a/.ci/packer_cache_for_branch.sh
+++ b/.ci/packer_cache_for_branch.sh
@@ -53,6 +53,8 @@ tar -cf "$HOME/.kibana/bootstrap_cache/$branch.tar" \
 
 echo "created $HOME/.kibana/bootstrap_cache/$branch.tar"
 
+.ci/build_docker.sh
+
 if [[ "$branch" != "master" ]]; then
   rm --preserve-root -rf "$checkoutDir"
 fi
diff --git a/vars/kibanaPipeline.groovy b/vars/kibanaPipeline.groovy
index eea3ff18f34530..00512937047174 100644
--- a/vars/kibanaPipeline.groovy
+++ b/vars/kibanaPipeline.groovy
@@ -390,12 +390,7 @@ def scriptTaskDocker(description, script) {
 
 def buildDocker() {
   sh(
-    script: """
-      cp /usr/local/bin/runbld .ci/
-      cp /usr/local/bin/bash_standard_lib.sh .ci/
-      cd .ci
-      docker build -t kibana-ci -f ./Dockerfile .
-    """,
+    script: "./.ci/build_docker.sh",
     label: 'Build CI Docker image'
   )
 }