From de8112909b115eb879ab9215127cb61384e6d5ae Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <dbd@ehtrace.com>
Date: Mon, 8 Apr 2024 23:07:41 +0200
Subject: [PATCH] Update ES 8 to 8.13.2

---
 example/elasticsearch.nomad.hcl         |  3 ++-
 example/images/elasticsearch/Dockerfile |  2 +-
 example/init/elasticsearch-vault-pki    |  2 +-
 example/prep.d/10-build-base-images.sh  | 34 +++++--------------------
 variables.yml                           |  2 +-
 5 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/example/elasticsearch.nomad.hcl b/example/elasticsearch.nomad.hcl
index 07779ae..0c81db4 100644
--- a/example/elasticsearch.nomad.hcl
+++ b/example/elasticsearch.nomad.hcl
@@ -29,6 +29,7 @@ job "elasticsearch" {
     }
 
 
+
     volume "data" {
       source          = "elasticsearch-data"
       type            = "csi"
@@ -118,7 +119,7 @@ job "elasticsearch" {
       kill_timeout = "120s"
 
       config {
-        image           = "danielberteaud/elasticsearch:8.13.1-1"
+        image           = "danielberteaud/elasticsearch:8.13.2-1"
         pids_limit      = 1024
         readonly_rootfs = true
         volumes = [
diff --git a/example/images/elasticsearch/Dockerfile b/example/images/elasticsearch/Dockerfile
index 4006709..e6f97f6 100644
--- a/example/images/elasticsearch/Dockerfile
+++ b/example/images/elasticsearch/Dockerfile
@@ -1,6 +1,6 @@
 FROM danielberteaud/alpine:24.4-1 AS builder
 
-ARG ES_VERSION=8.13.1
+ARG ES_VERSION=8.13.2
 
 ADD https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}-linux-x86_64.tar.gz /tmp
 ADD https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}-linux-x86_64.tar.gz.sha512 /tmp
diff --git a/example/init/elasticsearch-vault-pki b/example/init/elasticsearch-vault-pki
index a133a8e..aac07de 100755
--- a/example/init/elasticsearch-vault-pki
+++ b/example/init/elasticsearch-vault-pki
@@ -34,7 +34,7 @@ vault write pki/elasticsearch/config/urls \
   ocsp_servers="${VAULT_ADDR}/v1/pki/elasticsearch/ocsp"
 
 vault write pki/elasticsearch/config/cluster \
-  path="${VAULT_ADDR}/v1pki/elasticsearch"
+  path="${VAULT_ADDR}/v1/pki/elasticsearch"
 
 vault write pki/elasticsearch/config/crl \
   auto_rebuild=true \
diff --git a/example/prep.d/10-build-base-images.sh b/example/prep.d/10-build-base-images.sh
index 1a0ba03..7c25f91 100755
--- a/example/prep.d/10-build-base-images.sh
+++ b/example/prep.d/10-build-base-images.sh
@@ -79,19 +79,19 @@ function build_elasticsearch7 {
 }
 function build_elasticsearch8 {
   if [ "${IMAGE_ELASTICSEARCH8_AVAILABLE:-0}" = "1" ]; then
-    echo "Image danielberteaud/elasticsearch:8.13.1-1 already available"
+    echo "Image danielberteaud/elasticsearch:8.13.2-1 already available"
     return
   fi
-  if ! docker manifest inspect danielberteaud/elasticsearch:8.13.1-1 > /dev/null 2>&1; then
-    echo "Building elasticsearch:8.13.1-1"
+  if ! docker manifest inspect danielberteaud/elasticsearch:8.13.2-1 > /dev/null 2>&1; then
+    echo "Building elasticsearch:8.13.2-1"
     export BUILDKIT_PROGRESS=plain
-    docker build -t danielberteaud/elasticsearch:8.13.1-1 -t danielberteaud/elasticsearch:8 -t danielberteaud/elasticsearch8:latest --build-arg=ES_VERSION=8.13.1 output/images/elasticsearch &&\
-      docker push danielberteaud/elasticsearch:8.13.1-1 &&\
+    docker build -t danielberteaud/elasticsearch:8.13.2-1 -t danielberteaud/elasticsearch:8 -t danielberteaud/elasticsearch8:latest --build-arg=ES_VERSION=8.13.2 output/images/elasticsearch &&\
+      docker push danielberteaud/elasticsearch:8.13.2-1 &&\
       docker push danielberteaud/elasticsearch:8 &&\
       docker push danielberteaud/elasticsearch8:latest &&\
-      echo "danielberteaud/elasticsearch:8.13.1-1 pushed to remote repo"
+      echo "danielberteaud/elasticsearch:8.13.2-1 pushed to remote repo"
   else
-    echo "Image danielberteaud/elasticsearch:8.13.1-1 already available"
+    echo "Image danielberteaud/elasticsearch:8.13.2-1 already available"
   fi
   IMAGE_ELASTICSEARCH8_AVAILABLE=1
 }
@@ -243,25 +243,6 @@ function build_pgbouncer {
   fi
   IMAGE_PGBOUNCER_AVAILABLE=1
 }
-function build_pgcat {
-  if [ "${IMAGE_PGCAT_AVAILABLE:-0}" = "1" ]; then
-    echo "Image danielberteaud/pgcat:1.1.1-1 already available"
-    return
-  fi
-  # Image pgcat depends on alpine
-  build_alpine
-  if ! docker manifest inspect danielberteaud/pgcat:1.1.1-1 > /dev/null 2>&1; then
-    echo "Building pgcat:1.1.1-1"
-    export BUILDKIT_PROGRESS=plain
-    docker build -t danielberteaud/pgcat:1.1.1-1 -t danielberteaud/pgcat:latest output/images/pgcat &&\
-      docker push danielberteaud/pgcat:1.1.1-1 &&\
-      docker push danielberteaud/pgcat:latest &&\
-      echo "danielberteaud/pgcat:1.1.1-1 pushed to remote repo"
-  else
-    echo "Image danielberteaud/pgcat:1.1.1-1 already available"
-  fi
-  IMAGE_PGCAT_AVAILABLE=1
-}
 function build_php82 {
   if [ "${IMAGE_PHP82_AVAILABLE:-0}" = "1" ]; then
     echo "Image danielberteaud/php:82.24.4-1 already available"
@@ -410,7 +391,6 @@ build_mariadb
 build_mariadb_client
 build_mongo50
 build_pgbouncer
-build_pgcat
 build_php82
 build_php83
 build_postgres15
diff --git a/variables.yml b/variables.yml
index 427e3ef..3ef9bdf 100644
--- a/variables.yml
+++ b/variables.yml
@@ -138,7 +138,7 @@ docker:
     elasticsearch8:
       image: elasticsearch:[[ .docker.base_images.elasticsearch8.build_args.ES_VERSION ]]-1
       build_args:
-        ES_VERSION: 8.13.1
+        ES_VERSION: 8.13.2
       tags:
         - elasticsearch:8
         - elasticsearch8:latest