fix(build) use correct base image for rhel8 tests

Kong · Nov 3, 2020 · 1ee4f72 · 1ee4f72
1 parent 60f2c3b
commit 1ee4f72
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/test/build_container.sh b/test/build_container.sh
@@ -1,5 +1,7 @@
 set -e
 
+DOCKER_BUILD_ARGS=()
+
 if [ "$RESTY_IMAGE_BASE" == "src" ]; then
   exit 0
 fi
@@ -26,18 +28,21 @@ if [ "$RESTY_IMAGE_TAG" == "stretch" ] || [ "$RESTY_IMAGE_TAG" == "jessie" ]; th
 fi
 
 if [ "$RESTY_IMAGE_BASE" == "rhel" ]; then
-  sed -i 's/rhel7/rhel'${RESTY_IMAGE_TAG}'/' docker-kong/rhel/Dockerfile
   cp output/*.rhel${RESTY_IMAGE_TAG}.${ARCHITECTURE}.rpm docker-kong/rhel/kong.rpm
   BUILD_DIR="rhel"
+  DOCKER_BUILD_ARGS+=(--build-arg RHEL_VERSION=$RESTY_IMAGE_TAG)
 else
   sed -i 's/^FROM .*/FROM '${RESTY_IMAGE_BASE}:${RESTY_IMAGE_TAG}'/' docker-kong/${BUILD_DIR}/Dockerfile
 fi
 
 pushd docker-kong/${BUILD_DIR}
-    docker build -t $KONG_TEST_IMAGE_NAME \
-    --no-cache \
-    --build-arg ASSET=local .
-    docker run -t $KONG_TEST_IMAGE_NAME kong version
+  DOCKER_BUILD_ARGS+=(--no-cache)
+  DOCKER_BUILD_ARGS+=(--build-arg ASSET=local .)
+
+  docker build -t $KONG_TEST_IMAGE_NAME \
+    "${DOCKER_BUILD_ARGS[@]}"
+
+  docker run -t $KONG_TEST_IMAGE_NAME kong version
 popd
 
 rm -rf docker-kong || true
diff --git a/test/tests/01-package/run.sh b/test/tests/01-package/run.sh
@@ -51,7 +51,7 @@ if [[ "$RESTY_IMAGE_BASE" != "alpine" ]]; then
   docker exec ${USE_TTY} user-validation-tests /bin/bash -c "test -d /home/kong/"
   docker exec ${USE_TTY} user-validation-tests /bin/bash -c "cat /etc/passwd | grep kong | grep -q /bin/sh"
 
-  if [[ "$RESTY_IMAGE_BASE" == "amazonlinux" ]]; then
+  if [[ "$RESTY_IMAGE_BASE" == "amazonlinux" || "$RESTY_IMAGE_BASE" == "rhel" ]]; then
     # Needed to run `su`
     docker exec ${USE_TTY} user-validation-tests /bin/bash -c "yum install -y util-linux"