From 1efda445cf94c5d3aa3f59114c91bf8c7214d1f7 Mon Sep 17 00:00:00 2001 From: Colin Hutchinson Date: Fri, 4 Feb 2022 11:06:55 -0500 Subject: [PATCH] feat(dockerfiles): move our dockerfiles refs: #FT-2144 (#439) * feat(dockerfiles): move our dockerfiles * chore(revert): swap to official settings * chore(ci): add xenial back-in * fix(amazonlinux): we need to nuke two lines so we can test amazonlinux assets * fix(rpm): move the rpm hack into the docker-kong repository * fix(centos8): substitute rockylinux:8 for centos:8 when doing user validation testing * Update Makefile --- Makefile | 59 +++++++++++--------------------- build-kong.sh | 6 ++-- dockerfiles/Dockerfile.apk | 16 --------- dockerfiles/Dockerfile.deb | 44 ------------------------ dockerfiles/Dockerfile.kong | 5 ++- dockerfiles/Dockerfile.openresty | 5 ++- dockerfiles/Dockerfile.package | 6 ++-- dockerfiles/Dockerfile.rpm | 24 ------------- dockerfiles/Dockerfile.scratch | 5 ++- fpm-entrypoint.sh | 8 ++--- test/tests/01-package/run.sh | 2 +- 11 files changed, 37 insertions(+), 143 deletions(-) delete mode 100644 dockerfiles/Dockerfile.apk delete mode 100644 dockerfiles/Dockerfile.deb delete mode 100644 dockerfiles/Dockerfile.rpm diff --git a/Makefile b/Makefile index 3fd7b4f9..fa93e12d 100644 --- a/Makefile +++ b/Makefile @@ -145,39 +145,19 @@ else ifeq ($(BUILDX),true) -docker-machine rm --force ${DOCKER_MACHINE_ARM64_NAME} endif -build-base: - docker pull centos:8 - docker tag centos:8 centos:7 - docker pull debian:9 - docker tag debian:9 debian:8 -ifeq ($(RESTY_IMAGE_BASE),src) - @echo "nothing to be done" -else ifeq ($(RESTY_IMAGE_BASE),rhel) - docker pull centos:${RESTY_IMAGE_TAG} - docker tag centos:${RESTY_IMAGE_TAG} rhel:${RESTY_IMAGE_TAG} - PACKAGE_TYPE=rpm -endif - $(CACHE_COMMAND) $(DOCKER_REPOSITORY):$(RESTY_IMAGE_BASE)-$(RESTY_IMAGE_TAG)-$(DOCKER_BASE_SUFFIX) || \ - ( $(DOCKER_COMMAND) -f dockerfiles/Dockerfile.$(PACKAGE_TYPE) \ - --build-arg RESTY_IMAGE_TAG="$(RESTY_IMAGE_TAG)" \ - --build-arg RESTY_IMAGE_BASE=$(RESTY_IMAGE_BASE) \ - -t $(DOCKER_REPOSITORY):$(RESTY_IMAGE_BASE)-$(RESTY_IMAGE_TAG)-$(DOCKER_BASE_SUFFIX) . ) - build-openresty: ifeq ($(RESTY_IMAGE_BASE),src) @echo "nothing to be done" else -rm -rf kong -cp -R $(KONG_SOURCE_LOCATION) kong - $(CACHE_COMMAND) $(DOCKER_REPOSITORY):openresty-$(RESTY_IMAGE_BASE)-$(RESTY_IMAGE_TAG)-$(DOCKER_OPENRESTY_SUFFIX) || \ - ( $(MAKE) build-base ; \ - $(DOCKER_COMMAND) -f dockerfiles/Dockerfile.openresty \ + $(CACHE_COMMAND) $(DOCKER_REPOSITORY):openresty-$(PACKAGE_TYPE)-$(DOCKER_OPENRESTY_SUFFIX) || \ + ( $(DOCKER_COMMAND) -f dockerfiles/Dockerfile.openresty \ --build-arg RESTY_VERSION=$(RESTY_VERSION) \ --build-arg RESTY_LUAROCKS_VERSION=$(RESTY_LUAROCKS_VERSION) \ --build-arg RESTY_OPENSSL_VERSION=$(RESTY_OPENSSL_VERSION) \ --build-arg RESTY_PCRE_VERSION=$(RESTY_PCRE_VERSION) \ - --build-arg RESTY_IMAGE_TAG="$(RESTY_IMAGE_TAG)" \ - --build-arg RESTY_IMAGE_BASE=$(RESTY_IMAGE_BASE) \ + --build-arg PACKAGE_TYPE=$(PACKAGE_TYPE) \ --build-arg DOCKER_REPOSITORY=$(DOCKER_REPOSITORY) \ --build-arg DOCKER_BASE_SUFFIX=$(DOCKER_BASE_SUFFIX) \ --build-arg LIBYAML_VERSION=$(LIBYAML_VERSION) \ @@ -188,7 +168,7 @@ else --build-arg RESTY_LMDB=$(RESTY_LMDB) \ --build-arg OPENRESTY_PATCHES=$(OPENRESTY_PATCHES) \ --build-arg DEBUG=$(DEBUG) \ - -t $(DOCKER_REPOSITORY):openresty-$(RESTY_IMAGE_BASE)-$(RESTY_IMAGE_TAG)-$(DOCKER_OPENRESTY_SUFFIX) . ) + -t $(DOCKER_REPOSITORY):openresty-$(PACKAGE_TYPE)-$(DOCKER_OPENRESTY_SUFFIX) . ) endif ifeq ($(RESTY_IMAGE_BASE),src) @@ -204,8 +184,9 @@ ifeq ($(DEBUG),1) endif make build-kong @$(DOCKER_COMMAND) -f dockerfiles/Dockerfile.package \ - --build-arg RESTY_IMAGE_TAG="$(RESTY_IMAGE_TAG)" \ --build-arg RESTY_IMAGE_BASE=$(RESTY_IMAGE_BASE) \ + --build-arg RESTY_IMAGE_TAG=$(RESTY_IMAGE_TAG) \ + --build-arg PACKAGE_TYPE=$(PACKAGE_TYPE) \ --build-arg DOCKER_REPOSITORY=$(DOCKER_REPOSITORY) \ --build-arg DOCKER_KONG_SUFFIX=$(DOCKER_KONG_SUFFIX) \ --build-arg KONG_SHA=$(KONG_SHA) \ @@ -215,17 +196,16 @@ endif --build-arg KONG_CONFLICTS=$(KONG_CONFLICTS) \ --build-arg PRIVATE_KEY_FILE=kong.private.gpg-key.asc \ --build-arg PRIVATE_KEY_PASSPHRASE="$(PRIVATE_KEY_PASSPHRASE)" \ - -t $(DOCKER_REPOSITORY):kong-packaged-$(RESTY_IMAGE_BASE)-$(RESTY_IMAGE_TAG)-$(DOCKER_KONG_SUFFIX) . + -t $(DOCKER_REPOSITORY):kong-packaged-$(PACKAGE_TYPE)-$(DOCKER_KONG_SUFFIX) . ifeq ($(BUILDX),false) - docker run -d --rm --name output $(DOCKER_REPOSITORY):kong-packaged-$(RESTY_IMAGE_BASE)-$(RESTY_IMAGE_TAG)-$(DOCKER_KONG_SUFFIX) tail -f /dev/null + docker run -d --rm --name output $(DOCKER_REPOSITORY):kong-packaged-$(PACKAGE_TYPE)-$(DOCKER_KONG_SUFFIX) tail -f /dev/null docker cp output:/output/ output docker stop output mv output/output/*.$(PACKAGE_TYPE)* output/ rm -rf output/*/ else docker buildx build --output output --platform linux/amd64,linux/arm64 -f dockerfiles/Dockerfile.scratch \ - --build-arg RESTY_IMAGE_TAG="$(RESTY_IMAGE_TAG)" \ - --build-arg RESTY_IMAGE_BASE=$(RESTY_IMAGE_BASE) \ + --build-arg PACKAGE_TYPE=$(PACKAGE_TYPE) \ --build-arg DOCKER_REPOSITORY=$(DOCKER_REPOSITORY) \ --build-arg DOCKER_KONG_SUFFIX=$(DOCKER_KONG_SUFFIX) \ --build-arg KONG_SHA=$(KONG_SHA) . @@ -244,14 +224,13 @@ actual-build-kong: touch id_rsa.private -rm -rf kong -cp -R $(KONG_SOURCE_LOCATION) kong - $(CACHE_COMMAND) $(DOCKER_REPOSITORY):kong-$(RESTY_IMAGE_BASE)-$(RESTY_IMAGE_TAG)-$(DOCKER_KONG_SUFFIX) || \ + $(CACHE_COMMAND) $(DOCKER_REPOSITORY):kong-$(PACKAGE_TYPE)-$(DOCKER_KONG_SUFFIX) || \ ( $(MAKE) build-openresty && \ $(DOCKER_COMMAND) -f dockerfiles/Dockerfile.kong \ - --build-arg RESTY_IMAGE_TAG="$(RESTY_IMAGE_TAG)" \ - --build-arg RESTY_IMAGE_BASE=$(RESTY_IMAGE_BASE) \ + --build-arg PACKAGE_TYPE=$(PACKAGE_TYPE) \ --build-arg DOCKER_REPOSITORY=$(DOCKER_REPOSITORY) \ --build-arg DOCKER_OPENRESTY_SUFFIX=$(DOCKER_OPENRESTY_SUFFIX) \ - -t $(DOCKER_REPOSITORY):kong-$(RESTY_IMAGE_BASE)-$(RESTY_IMAGE_TAG)-$(DOCKER_KONG_SUFFIX) . ) + -t $(DOCKER_REPOSITORY):kong-$(PACKAGE_TYPE)-$(DOCKER_KONG_SUFFIX) . ) kong-test-container: ifneq ($(RESTY_IMAGE_BASE),src) @@ -259,7 +238,7 @@ ifneq ($(RESTY_IMAGE_BASE),src) -cp -R $(KONG_SOURCE_LOCATION) kong $(CACHE_COMMAND) $(DOCKER_REPOSITORY):test-$(DOCKER_TEST_SUFFIX) || \ ( $(MAKE) build-openresty && \ - docker tag $(DOCKER_REPOSITORY):openresty-$(RESTY_IMAGE_BASE)-$(RESTY_IMAGE_TAG)-$(DOCKER_OPENRESTY_SUFFIX) \ + docker tag $(DOCKER_REPOSITORY):openresty-$(PACKAGE_TYPE)-$(DOCKER_OPENRESTY_SUFFIX) \ $(DOCKER_REPOSITORY):test-$(DOCKER_OPENRESTY_SUFFIX) && \ $(DOCKER_COMMAND) -f test/Dockerfile.test \ --build-arg KONG_GO_PLUGINSERVER_VERSION=$(KONG_GO_PLUGINSERVER_VERSION) \ @@ -359,6 +338,8 @@ ifneq ($(RESTY_IMAGE_BASE),src) endif build-test-container: + docker pull rockylinux:8 + docker tag rockylinux:8 centos:8 touch test/kong_license.private ARCHITECTURE=amd64 \ RESTY_IMAGE_BASE=$(RESTY_IMAGE_BASE) \ @@ -407,8 +388,8 @@ cleanup: cleanup-tests cleanup-build -rm -rf output/* update-cache-images: - -$(UPDATE_CACHE_COMMAND) $(DOCKER_REPOSITORY):$(RESTY_IMAGE_BASE)-$(RESTY_IMAGE_TAG)-$(DOCKER_BASE_SUFFIX) - -docker tag $(DOCKER_REPOSITORY):$(RESTY_IMAGE_BASE)-$(RESTY_IMAGE_TAG)-$(DOCKER_BASE_SUFFIX) $(DOCKER_REPOSITORY):$(RESTY_IMAGE_BASE)-$(RESTY_IMAGE_TAG) || true - -$(UPDATE_CACHE_COMMAND) $(DOCKER_REPOSITORY):$(RESTY_IMAGE_BASE)-$(RESTY_IMAGE_TAG) || true - -$(UPDATE_CACHE_COMMAND) $(DOCKER_REPOSITORY):openresty-$(RESTY_IMAGE_BASE)-$(RESTY_IMAGE_TAG)-$(DOCKER_OPENRESTY_SUFFIX) - -$(UPDATE_CACHE_COMMAND) $(DOCKER_REPOSITORY):kong-$(RESTY_IMAGE_BASE)-$(RESTY_IMAGE_TAG)-$(DOCKER_KONG_SUFFIX) + -$(UPDATE_CACHE_COMMAND) $(DOCKER_REPOSITORY):$(PACKAGE_TYPE)-$(DOCKER_BASE_SUFFIX) + -docker tag $(DOCKER_REPOSITORY):$(PACKAGE_TYPE)-$(DOCKER_BASE_SUFFIX) $(DOCKER_REPOSITORY):$(PACKAGE_TYPE) || true + -$(UPDATE_CACHE_COMMAND) $(DOCKER_REPOSITORY):$(PACKAGE_TYPE) || true + -$(UPDATE_CACHE_COMMAND) $(DOCKER_REPOSITORY):openresty-$(PACKAGE_TYPE)-$(DOCKER_OPENRESTY_SUFFIX) + -$(UPDATE_CACHE_COMMAND) $(DOCKER_REPOSITORY):kong-$(PACKAGE_TYPE)-$(DOCKER_KONG_SUFFIX) diff --git a/build-kong.sh b/build-kong.sh index eb97fc7e..84b1e84a 100755 --- a/build-kong.sh +++ b/build-kong.sh @@ -16,8 +16,10 @@ export GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChec export LUAROCKS_CONFIG=$ROCKS_CONFIG export LUA_PATH="/usr/local/share/lua/5.1/?.lua;/usr/local/openresty/luajit/share/luajit-2.1.0-beta3/?.lua;;" export PATH=$PATH:/usr/local/openresty/luajit/bin - -cp -R /tmp/build/* / + +/usr/local/bin/luarocks --version +/usr/local/kong/bin/openssl version +/usr/local/openresty/bin/openresty -v if test -f /root/id_rsa; then mkdir -p /root/.ssh diff --git a/dockerfiles/Dockerfile.apk b/dockerfiles/Dockerfile.apk deleted file mode 100644 index 4ff785e1..00000000 --- a/dockerfiles/Dockerfile.apk +++ /dev/null @@ -1,16 +0,0 @@ -ARG RESTY_IMAGE_TAG="3.10" - -FROM alpine:3.10 - -ARG YQ_VERSION=1.15.0 - -RUN apk update \ - && apk upgrade \ - && apk add --no-cache cmake gcc make g++ musl-dev pcre-dev \ - openssl-dev zlib-dev ncurses-dev readline-dev curl perl \ - libffi-dev libc-dev git unzip tar openssh m4 xz gnupg openssl musl \ - linux-headers bsd-compat-headers bash go wget shadow \ - ca-certificates wget coreutils patch grep sed \ - && curl -sSL https://github.com/mikefarah/yq/releases/download/$YQ_VERSION/yq_linux_amd64 -o /usr/local/bin/yaml \ - && chmod +x /usr/local/bin/yaml \ - && update-ca-certificates diff --git a/dockerfiles/Dockerfile.deb b/dockerfiles/Dockerfile.deb deleted file mode 100644 index e707af93..00000000 --- a/dockerfiles/Dockerfile.deb +++ /dev/null @@ -1,44 +0,0 @@ -# Dockerfile - Ubuntu -# Ubuntu base image with all prerequisites to compile / install openresty and Kong - -ARG RESTY_IMAGE_BASE="ubuntu" -ARG RESTY_IMAGE_TAG="20.04" - -FROM ${RESTY_IMAGE_BASE}:${RESTY_IMAGE_TAG} - -ARG YQ_VERSION=1.15.0 -ARG CMAKE_VERSION=3.15.7 - -RUN DEBIAN_FRONTEND=noninteractive apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get upgrade -y \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - build-essential \ - ca-certificates \ - curl \ - gettext-base \ - libgd-dev \ - libgeoip-dev \ - libncurses5-dev \ - libperl-dev \ - libreadline-dev \ - libxslt1-dev \ - make \ - perl \ - unzip \ - zlib1g-dev \ - libssl-dev \ - git \ - m4 \ - file \ - ssh \ - valgrind \ - wget \ - && curl -sSL https://github.com/mikefarah/yq/releases/download/$YQ_VERSION/yq_linux_amd64 -o /usr/local/bin/yaml \ - && chmod +x /usr/local/bin/yaml \ - && curl -sSL https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/cmake-$CMAKE_VERSION.tar.gz -o /tmp/cmake-$CMAKE_VERSION.tar.gz \ - && tar -xzvf /tmp/cmake-$CMAKE_VERSION.tar.gz -C /tmp \ - && cd /tmp/cmake-$CMAKE_VERSION \ - && ./bootstrap \ - && make -j 1 \ - && make install \ - && rm -rf /tmp/cmake-$CMAKE_VERSION.tar.gz /tmp/cmake-$CMAKE_VERSION diff --git a/dockerfiles/Dockerfile.kong b/dockerfiles/Dockerfile.kong index d7a68058..67969e25 100644 --- a/dockerfiles/Dockerfile.kong +++ b/dockerfiles/Dockerfile.kong @@ -1,9 +1,8 @@ -ARG RESTY_IMAGE_BASE="ubuntu" -ARG RESTY_IMAGE_TAG="20.04" +ARG PACKAGE_TYPE ARG DOCKER_OPENRESTY_SUFFIX ARG DOCKER_REPOSITORY -FROM ${DOCKER_REPOSITORY}:openresty-${RESTY_IMAGE_BASE}-${RESTY_IMAGE_TAG}-${DOCKER_OPENRESTY_SUFFIX} +FROM ${DOCKER_REPOSITORY}:openresty-${PACKAGE_TYPE}-${DOCKER_OPENRESTY_SUFFIX} WORKDIR /kong COPY kong /kong diff --git a/dockerfiles/Dockerfile.openresty b/dockerfiles/Dockerfile.openresty index 981853c0..bd37f6e9 100644 --- a/dockerfiles/Dockerfile.openresty +++ b/dockerfiles/Dockerfile.openresty @@ -1,9 +1,8 @@ -ARG RESTY_IMAGE_BASE="ubuntu" -ARG RESTY_IMAGE_TAG="20.04" ARG DOCKER_BASE_SUFFIX ARG DOCKER_REPOSITORY +ARG PACKAGE_TYPE -FROM ${DOCKER_REPOSITORY}:${RESTY_IMAGE_BASE}-${RESTY_IMAGE_TAG}-${DOCKER_BASE_SUFFIX} +FROM kong/kong-build-tools:$PACKAGE_TYPE ARG EDITION="community" ENV EDITION $EDITION diff --git a/dockerfiles/Dockerfile.package b/dockerfiles/Dockerfile.package index f96376b5..b5da06bb 100644 --- a/dockerfiles/Dockerfile.package +++ b/dockerfiles/Dockerfile.package @@ -1,10 +1,9 @@ -ARG RESTY_IMAGE_BASE="ubuntu" -ARG RESTY_IMAGE_TAG="20.04" +ARG PACKAGE_TYPE ARG DOCKER_KONG_SUFFIX ARG KONG_SHA ARG DOCKER_REPOSITORY -FROM ${DOCKER_REPOSITORY}:kong-${RESTY_IMAGE_BASE}-${RESTY_IMAGE_TAG}-${DOCKER_KONG_SUFFIX} as KONG +FROM ${DOCKER_REPOSITORY}:kong-${PACKAGE_TYPE}-${DOCKER_KONG_SUFFIX} as KONG FROM kong/fpm:latest as FPM @@ -19,6 +18,7 @@ ENV PRIVATE_KEY_PASSPHRASE ${PRIVATE_KEY_PASSPHRASE} ARG RESTY_IMAGE_BASE="ubuntu" ARG RESTY_IMAGE_TAG="16.04" +ARG PACKAGE_TYPE ARG KONG_VERSION ARG KONG_PACKAGE_NAME ARG KONG_CONFLICTS diff --git a/dockerfiles/Dockerfile.rpm b/dockerfiles/Dockerfile.rpm deleted file mode 100644 index c161f544..00000000 --- a/dockerfiles/Dockerfile.rpm +++ /dev/null @@ -1,24 +0,0 @@ -# Dockerfile - Centos -# Centos base image with all prerequisites to compile / install openresty and Kong - -ARG RESTY_IMAGE_BASE="centos" -ARG RESTY_IMAGE_TAG="7" - -FROM ${RESTY_IMAGE_BASE}:${RESTY_IMAGE_TAG} - -ARG YQ_VERSION=1.15.0 -ARG CMAKE_VERSION=3.15.7 - -RUN yum update -y && \ - yum -y install ca-certificates wget tar readline-devel pcre-devel openssl-devel \ - gcc curl unzip zlib-devel make gcc gcc-c++ bzip2 patch perl m4 git wget \ - && curl -sSL https://github.com/mikefarah/yq/releases/download/$YQ_VERSION/yq_linux_amd64 -o /usr/local/bin/yaml \ - && chmod +x /usr/local/bin/yaml \ - && curl -sSL https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/cmake-$CMAKE_VERSION.tar.gz -o /tmp/cmake-$CMAKE_VERSION.tar.gz \ - && tar -xzvf /tmp/cmake-$CMAKE_VERSION.tar.gz -C /tmp \ - && cd /tmp/cmake-$CMAKE_VERSION \ - && ./bootstrap \ - && make -j 2 \ - && make install \ - && rm -rf /tmp/cmake-$CMAKE_VERSION.tar.gz /tmp/cmake-$CMAKE_VERSION - diff --git a/dockerfiles/Dockerfile.scratch b/dockerfiles/Dockerfile.scratch index 6da4b3ff..1691cf6b 100644 --- a/dockerfiles/Dockerfile.scratch +++ b/dockerfiles/Dockerfile.scratch @@ -1,10 +1,9 @@ -ARG RESTY_IMAGE_BASE="ubuntu" -ARG RESTY_IMAGE_TAG="16.04" +ARG PACKAGE_TYPE ARG DOCKER_KONG_SUFFIX ARG KONG_SHA ARG DOCKER_REPOSITORY -FROM --platform=$TARGETPLATFORM ${DOCKER_REPOSITORY}:kong-packaged-${RESTY_IMAGE_BASE}-${RESTY_IMAGE_TAG}-${DOCKER_KONG_SUFFIX} as FPM +FROM --platform=$TARGETPLATFORM ${DOCKER_REPOSITORY}:kong-packaged-${PACKAGE_TYPE}-${DOCKER_KONG_SUFFIX} as FPM FROM --platform=$TARGETPLATFORM scratch diff --git a/fpm-entrypoint.sh b/fpm-entrypoint.sh index 1b183961..8313c65a 100755 --- a/fpm-entrypoint.sh +++ b/fpm-entrypoint.sh @@ -5,12 +5,10 @@ set -o errexit cd /tmp/build FPM_PARAMS="" -if [ "$RESTY_IMAGE_BASE" == "ubuntu" ] || [ "$RESTY_IMAGE_BASE" == "debian" ]; then - PACKAGE_TYPE="deb" +if [ "$PACKAGE_TYPE" == "deb" ]; then FPM_PARAMS="-d libpcre3 -d perl -d zlib1g-dev" OUTPUT_FILE_SUFFIX=".${RESTY_IMAGE_TAG}" -elif [ "$RESTY_IMAGE_BASE" == "centos" ] || [ "$RESTY_IMAGE_BASE" == "rhel" ] || [ "$RESTY_IMAGE_BASE" == "amazonlinux" ]; then - PACKAGE_TYPE="rpm" +elif [ "$PACKAGE_TYPE" == "rpm" ]; then FPM_PARAMS="-d pcre -d perl -d perl-Time-HiRes -d zlib -d zlib-devel" OUTPUT_FILE_SUFFIX=".rhel${RESTY_IMAGE_TAG}" if [ "$RESTY_IMAGE_TAG" == "7" ]; then @@ -28,7 +26,7 @@ OUTPUT_FILE_SUFFIX="${OUTPUT_FILE_SUFFIX}."$(echo ${BUILDPLATFORM} | awk -F "/" ROCKSPEC_VERSION=`basename /tmp/build/build/usr/local/lib/luarocks/rocks/kong/*` -if [ "$RESTY_IMAGE_BASE" == "alpine" ]; then +if [ "$PACKAGE_TYPE" == "apk" ]; then pushd /tmp/build mkdir /output tar -zcvf /output/${KONG_PACKAGE_NAME}-${KONG_VERSION}${OUTPUT_FILE_SUFFIX}.apk.tar.gz usr etc diff --git a/test/tests/01-package/run.sh b/test/tests/01-package/run.sh index 6b0ac52a..82fd8596 100644 --- a/test/tests/01-package/run.sh +++ b/test/tests/01-package/run.sh @@ -8,7 +8,7 @@ fi if [[ "$PACKAGE_TYPE" == "rpm" ]]; then cp $PACKAGE_LOCATION/*amd64.rpm kong.rpm - docker exec ${USE_TTY} user-validation-tests /bin/bash -c "yum install -y /src/kong.rpm" + docker exec ${USE_TTY} user-validation-tests /bin/bash -c "yum install -y /src/kong.rpm procps" docker exec ${USE_TTY} user-validation-tests /bin/bash -c "kong version" # Tests disabled until CSRE-467 is resolved # docker exec ${USE_TTY} user-validation-tests /bin/bash -c "rpm --import https://download.konghq.com/gateway-2.x-rhel-8/repodata/repomd.xml.key"