diff --git a/Dockerfile.deb b/Dockerfile.deb index 873266a7..62194947 100644 --- a/Dockerfile.deb +++ b/Dockerfile.deb @@ -1,9 +1,9 @@ FROM debian:bullseye-slim -ARG KONG_VERSION=2.8.4 +ARG KONG_VERSION=2.8.5 ENV KONG_VERSION $KONG_VERSION -ARG KONG_SHA256="28f7f215a097612f35d3ae86d35c3fbb24a1454a7529f500e2341d5764a5d8a5" +ARG KONG_SHA256="9ae11fb9e748caaf564e825b4cbfd58a25a6ccbf0d6a470174c2138680a8f7a3" ARG KONG_PREFIX=/usr/local/kong ENV KONG_PREFIX $KONG_PREFIX diff --git a/Dockerfile.rpm b/Dockerfile.rpm index 84a13e0b..bd8b0f3e 100644 --- a/Dockerfile.rpm +++ b/Dockerfile.rpm @@ -1,9 +1,9 @@ FROM redhat/ubi8 -ARG KONG_VERSION=2.8.4 +ARG KONG_VERSION=2.8.5 ENV KONG_VERSION $KONG_VERSION -ARG KONG_SHA256="5d3e2712dd4d6b2b3adbe9bafdadd1f15f1f9c89256f9c24d339e4f44f9cc94d" +ARG KONG_SHA256="2e82cc14aef707796c952d38c835c9e0abc0e3ccdc94f1d752118699a62672fb" ARG KONG_PREFIX=/usr/local/kong ENV KONG_PREFIX $KONG_PREFIX diff --git a/ubuntu/Dockerfile b/ubuntu/Dockerfile index 6d3d2def..d6b22ac6 100644 --- a/ubuntu/Dockerfile +++ b/ubuntu/Dockerfile @@ -7,10 +7,10 @@ ARG EE_PORTS COPY kong.deb /tmp/kong.deb -ARG KONG_VERSION=2.8.4 +ARG KONG_VERSION=2.8.5 ENV KONG_VERSION $KONG_VERSION -ARG KONG_AMD64_SHA="e4bc62c80f717114cc486776ee453931c5de0e8eaf0901ac11dbb4b2bae14534" +ARG KONG_AMD64_SHA="efba2bb8b1cb567bc90cc371e80503c558cbc74377b34609552ae2273def3fe3" ARG KONG_ARM64_SHA="4fff44f9a0c7b06469591b7d1499a99a100109bc3f08dc412dd0eb38ff383d35" # hadolint ignore=DL3015 diff --git a/update.sh b/update.sh index fcd3ca28..6ff7489f 100755 --- a/update.sh +++ b/update.sh @@ -34,11 +34,11 @@ function get_url() { eval $args - raw_url=$(egrep -o 'https?://packages.konghq.com/public/gateway-[^ ]+' $dockerfile | sed 's/\"//g') + raw_url=$(grep -E -o 'https?://packages.konghq.com/public/gateway-[^ ]+' $dockerfile | sed 's/\"//g') # set variables contained in raw url KONG_VERSION=$version - KONG_REPO=$(echo ${KONG_VERSION%.*} | sed 's/\.//') + major_minor=$(echo ${KONG_VERSION%.*} | sed 's/\.//') ARCH=$arch eval echo $raw_url @@ -52,8 +52,8 @@ if [[ -n "$kbt_in_kong_v" ]]; then sed -i.bak 's/KONG_BUILD_TOOLS?=.*/KONG_BUILD_TOOLS?='$kbt_in_kong_v'/g' Makefile fi -# Dockerfile.deb -url=$(get_url Dockerfile.rpm amd64 "VERSION=8") +# Dockerfile.rpm +url=$(get_url Dockerfile.rpm x86_64 "VERSION=8") echo $url curl -fL $url -o /tmp/kong new_sha=$(sha256sum /tmp/kong | cut -b1-64) @@ -62,7 +62,7 @@ sed -i.bak 's/ARG KONG_SHA256=.*/ARG KONG_SHA256=\"'$new_sha'\"/g' Dockerfile.rp sed -i.bak 's/ARG KONG_VERSION=.*/ARG KONG_VERSION='$version'/g' Dockerfile.rpm pushd ubuntu - url=$(get_url Dockerfile amd64 "UBUNTU_CODENAME=jammy") + url=$(get_url Dockerfile amd64 "CODENAME=jammy") echo $url curl -fL $url -o /tmp/kong new_sha=$(sha256sum /tmp/kong | cut -b1-64)