Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(*) bump to Kong 3.7.1 #707

Merged
merged 3 commits into from
Jun 21, 2024
Merged

chore(*) bump to Kong 3.7.1 #707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a9837a3
chore(*) bump to Kong 3.7.1
kikito Jun 21, 2024
ed32266
fix(*): use compose plugin instead of docker-compose
locao Jun 21, 2024
ed348d0
tests(*): fix file name
locao Jun 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile.deb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.rpm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions compose/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
20 changes: 10 additions & 10 deletions tests/01-image.test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)'
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/03-cis-sec.test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ubuntu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
Expand Down
Loading