Skip to content

Commit

Permalink
Release 3.3.0 (#654)
Browse files Browse the repository at this point in the history
Co-authored-by: Hans Hübner <[email protected]>
  • Loading branch information
kikito and hanshuebner committed May 22, 2023
1 parent ad2acca commit 5077757
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 292 deletions.
14 changes: 5 additions & 9 deletions Dockerfile.apk
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@ FROM alpine:3.17

LABEL maintainer="Kong Docker Maintainers <[email protected]> (@team-gateway-bot)"

ARG KONG_VERSION=3.1.1
ARG KONG_VERSION=3.3.0
ENV KONG_VERSION $KONG_VERSION

ARG KONG_AMD64_SHA="9194977814e91b6997ce4795957d9b4bcec9d220667e01a08ade7ac64704f57c"
ARG KONG_ARM64_SHA="92d98307a3193602bbe4dbed2d099cde5404a8acd09d53f0b9a9f2bcf6038500"
ARG KONG_AMD64_SHA="494522d5ef9baf674272bbb7075e406a4515a7475253fd3026cc7ca9451612a2"

ARG KONG_PREFIX=/usr/local/kong
ENV KONG_PREFIX $KONG_PREFIX
Expand All @@ -19,17 +18,14 @@ COPY kong.apk.tar.gz /tmp/kong.apk.tar.gz

RUN set -ex; \
apk add --virtual .build-deps curl tar gzip ca-certificates; \
arch="$(apk --print-arch)"; \
case "${arch}" in \
x86_64) export ARCH='amd64'; KONG_SHA256=$KONG_AMD64_SHA ;; \
aarch64) export ARCH='arm64'; KONG_SHA256=$KONG_ARM64_SHA ;; \
esac; \
export ARCH='amd64'; \
KONG_SHA256=$KONG_AMD64_SHA ; \
if [ "$ASSET" = "remote" ] ; then \
curl -fL "https://download.konghq.com/gateway-${KONG_VERSION%%.*}.x-alpine/kong-${KONG_VERSION}.${ARCH}.apk.tar.gz" -o /tmp/kong.apk.tar.gz \
&& echo "$KONG_SHA256 /tmp/kong.apk.tar.gz" | sha256sum -c -; \
fi \
&& tar -C / -xzf /tmp/kong.apk.tar.gz \
&& apk add --no-cache libstdc++ libgcc perl tzdata libcap zlib zlib-dev bash \
&& apk add --no-cache libstdc++ libgcc perl tzdata libcap zlib zlib-dev bash yaml \
&& adduser -S kong \
&& addgroup -S kong \
&& mkdir -p "${KONG_PREFIX}" \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.deb
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ FROM debian:bullseye-20230502-slim

LABEL maintainer="Kong Docker Maintainers <[email protected]> (@team-gateway-bot)"

ARG KONG_VERSION=3.1.1
ARG KONG_VERSION=3.3.0
ENV KONG_VERSION $KONG_VERSION

ARG KONG_SHA256="c9cd059e13f9eb5ee894f2d83dc0a77c649adbb636fcbfed66841960b6f00f0d"
ARG KONG_SHA256="2fcfaa2095d2eb9dc91820f2f5f0e623b0b8a7457ddcb6ddf5761f4cb02d14e9"

ARG KONG_PREFIX=/usr/local/kong
ENV KONG_PREFIX $KONG_PREFIX
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.rpm
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.1.1
ARG KONG_VERSION=3.3.0
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="70e43c48c2c404d7a8092a13a5857e36d469668d508b19f7fe70c4351c7b533d"
ARG KONG_SHA256="d5aef8421e962b97bb734bacb443ddf40733acfad61bf3cf97611619c348b2f6"

ARG KONG_PREFIX=/usr/local/kong
ENV KONG_PREFIX $KONG_PREFIX
Expand All @@ -31,7 +31,7 @@ COPY kong.rpm /tmp/kong.rpm
# hadolint ignore=DL3015
RUN set -ex; \
if [ "$ASSET" = "remote" ] ; then \
DOWNLOAD_URL="https://download.konghq.com/gateway-${KONG_VERSION%%.*}.x-rhel-8/Packages/k/kong-$KONG_VERSION.rhel8.6.amd64.rpm" \
DOWNLOAD_URL="https://download.konghq.com/gateway-${KONG_VERSION%%.*}.x-rhel-8/Packages/k/kong-$KONG_VERSION.rhel8.amd64.rpm" \
&& curl -fL $DOWNLOAD_URL -o /tmp/kong.rpm \
&& echo "$KONG_SHA256 /tmp/kong.rpm" | sha256sum -c - \
|| exit 1; \
Expand Down
260 changes: 0 additions & 260 deletions tests/02-customize.test.sh

This file was deleted.

8 changes: 4 additions & 4 deletions ubuntu/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:focal
FROM ubuntu:jammy

LABEL maintainer="Kong Docker Maintainers <[email protected]> (@team-gateway-bot)"

Expand All @@ -9,11 +9,11 @@ ARG EE_PORTS

COPY kong.deb /tmp/kong.deb

ARG KONG_VERSION=3.1.1
ARG KONG_VERSION=3.3.0
ENV KONG_VERSION $KONG_VERSION

ARG KONG_AMD64_SHA="39bbefa14d348dedf7734c742da46acf7777ff0018f2cad7961799ba4663277b"
ARG KONG_ARM64_SHA="ff2f7b5d0dc3bd97e08fe4254400daf8a7d23f6ef2e72d9cec7c14e64bbc38b3"
ARG KONG_AMD64_SHA="e8c5fe8cacf19477d37a3b16375a263183f0c87c9ec217c4ead0c774d286be5b"
ARG KONG_ARM64_SHA="2d918f7dd1ca5d54a6832cc370892a99af8e39fc4040df66d2d7ca6d97b9a2b5"

# hadolint ignore=DL3015
RUN set -ex; \
Expand Down
Loading

0 comments on commit 5077757

Please sign in to comment.