chore(*) bump to Kong 3.7.1 (#707)

* chore(*) bump to Kong 3.7.1 * fix(*): use compose plugin instead of docker-compose * tests(*): fix file name --------- Co-authored-by: Vinicius Mignot <[email protected]>
Kong · Jun 21, 2024 · 83bc641 · 83bc641
1 parent 7c1f670
commit 83bc641
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 22 deletions.
diff --git a/Dockerfile.deb b/Dockerfile.deb
@@ -2,10 +2,10 @@
 FROM debian:bullseye-20230502-slim
 
 LABEL maintainer="Kong Docker Maintainers <[email protected]> (@team-gateway-bot)"
-ARG KONG_VERSION=3.7.0
+ARG KONG_VERSION=3.7.1
 ENV KONG_VERSION $KONG_VERSION
 
-ARG KONG_SHA256="3f325e456d884f809b9480100dfb2ae613467fec6864a86e08c44b52a010d73a"
+ARG KONG_SHA256="df13bb5efddc35693a349d742d4e2948148f3adce0b8557b7ea58ddba6789b13"
 
 ARG KONG_PREFIX=/usr/local/kong
 ENV KONG_PREFIX $KONG_PREFIX

diff --git a/Dockerfile.rpm b/Dockerfile.rpm
@@ -3,7 +3,7 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7@sha256:6910799b75ad41f00891
 
 LABEL maintainer="Kong Docker Maintainers <[email protected]> (@team-gateway-bot)"
 
-ARG KONG_VERSION=3.7.0
+ARG KONG_VERSION=3.7.1
 ENV KONG_VERSION $KONG_VERSION
 
 # RedHat required labels
@@ -18,7 +18,7 @@ LABEL name="Kong" \
 # RedHat required LICENSE file approved path
 COPY LICENSE /licenses/
 
-ARG KONG_SHA256="f9f00e9674c970aa366cd2f4d6e597edb867084a84caee299c444cc973b5d8eb"
+ARG KONG_SHA256="e5faf8fb843c4eba5b131a41e727eab0e96f2eea4584bbeb9e6f867d4b1ee96d"
 
 ARG KONG_PREFIX=/usr/local/kong
 ENV KONG_PREFIX $KONG_PREFIX

diff --git a/compose/Makefile b/compose/Makefile
@@ -1,9 +1,9 @@
 kong-postgres:
-	COMPOSE_PROFILES=database KONG_DATABASE=postgres docker-compose up -d
+	COMPOSE_PROFILES=database KONG_DATABASE=postgres docker compose up -d
 
 kong-dbless:
-	docker-compose up -d
+	docker compose up -d
 
 clean:
-	docker-compose kill
-	docker-compose rm -f
+	docker compose kill
+	docker compose rm -f
diff --git a/tests/01-image.test.sh b/tests/01-image.test.sh
@@ -68,7 +68,7 @@ function run_test {
   }
 
   pushd compose
-  docker-compose up -d
+  docker compose up -d
   retry_health
 
   curl -I localhost:8001 | grep -E '(openresty|kong)'
@@ -78,8 +78,8 @@ function run_test {
     tfailure
   fi
 
-  docker-compose kill
-  docker-compose rm -f
+  docker compose kill
+  docker compose rm -f
   sleep 5
   docker volume prune -f
   popd
@@ -89,19 +89,19 @@ function run_test {
   export COMPOSE_PROFILES=database
   export KONG_DATABASE=postgres
   pushd compose
-  curl -fsSL https://raw.githubusercontent.com/Kong/docker-kong/1.5.0/swarm/docker-compose.yml | KONG_DOCKER_TAG=kong:1.5.0 docker-compose -p kong -f - up -d
+  curl -fsSL https://raw.githubusercontent.com/Kong/docker-kong/1.5.0/swarm/docker-compose.yml | KONG_DOCKER_TAG=kong:1.5.0 docker compose -p kong -f - up -d
   until docker ps -f health=healthy | grep -q kong:1.5.0;  do
-    curl -fsSL https://raw.githubusercontent.com/Kong/docker-kong/1.5.0/swarm/docker-compose.yml | docker-compose -p kong -f - ps
+    curl -fsSL https://raw.githubusercontent.com/Kong/docker-kong/1.5.0/swarm/docker-compose.yml | docker compose -p kong -f - ps
     docker ps
     sleep 15
-    curl -fsSL https://raw.githubusercontent.com/Kong/docker-kong/1.5.0/swarm/docker-compose.yml | KONG_DOCKER_TAG=kong:1.5.0 docker-compose -p kong -f - up -d
+    curl -fsSL https://raw.githubusercontent.com/Kong/docker-kong/1.5.0/swarm/docker-compose.yml | KONG_DOCKER_TAG=kong:1.5.0 docker compose -p kong -f - up -d
   done
   curl -I localhost:8001 | grep 'Server: openresty'
   sed -i -e 's/127.0.0.1://g' docker-compose.yml
 
-  KONG_DOCKER_TAG=${KONG_DOCKER_TAG} docker-compose -p kong up -d
+  KONG_DOCKER_TAG=${KONG_DOCKER_TAG} docker compose -p kong up -d
   until docker ps -f health=healthy | grep -q ${KONG_DOCKER_TAG}; do
-    docker-compose -p kong ps
+    docker compose -p kong ps
     docker ps
     sleep 15
   done
@@ -115,8 +115,8 @@ function run_test {
 
   echo "cleanup"
 
-  docker-compose -p kong kill
-  docker-compose -p kong rm -f
+  docker compose -p kong kill
+  docker compose -p kong rm -f
   sleep 5
   docker volume prune -f
   docker system prune -y

diff --git a/tests/03-cis-sec.test.sh b/tests/03-cis-sec.test.sh
@@ -6,7 +6,7 @@ function run_test {
   tinitialize "Docker-Kong test suite" "${BASH_SOURCE[0]}"
 
   tchapter "CIS-Sec tests $KONG_DOCKER_TAG"
-  ttest "CIS-Sec for docker-compose"
+  ttest "CIS-Sec for docker compose"
 
   docker kill $(docker ps -q)
   docker run -d kong-$BASE tail -f /dev/null

diff --git a/ubuntu/Dockerfile b/ubuntu/Dockerfile
@@ -9,11 +9,11 @@ ARG EE_PORTS
 
 COPY kong.deb /tmp/kong.deb
 
-ARG KONG_VERSION=3.7.0
+ARG KONG_VERSION=3.7.1
 ENV KONG_VERSION $KONG_VERSION
 
-ARG KONG_AMD64_SHA="71b946cac188653eb29714f21b98eb146cec536e05a5818a49007f9211e572d4"
-ARG KONG_ARM64_SHA="fb01282dfe9bf42ba27df30c2bc269aadac3ae3f298ba535f77b15a7bff2f6df"
+ARG KONG_AMD64_SHA="58e380961fc90c6b4dfd62f4ee596ab053afe5ae72a93445c4356f496f2dc9ec"
+ARG KONG_ARM64_SHA="602a68cf3a09bbea26106d4bd4041c242d7913e40582d18cac0f6958aad78f72"
 
 # hadolint ignore=DL3015
 RUN set -ex; \