From 613bb2b26e6c9ce641178f2d78abeac6e0286514 Mon Sep 17 00:00:00 2001 From: Colin Hutchinson Date: Mon, 5 Dec 2022 19:33:19 -0500 Subject: [PATCH] chore(deps): bump the base image and test libyaml is present (#3) --- Dockerfile | 8 ++++---- test.sh | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 09f42e8..99d3967 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,10 +4,10 @@ ARG DOCKER_REGISTRY=ghcr.io ARG DOCKER_IMAGE_NAME # List out all image permutations to trick dependabot -FROM --platform=linux/amd64 ghcr.io/kong/kong-openssl:1.1.0-x86_64-linux-musl as x86_64-linux-musl -FROM --platform=linux/amd64 ghcr.io/kong/kong-openssl:1.1.0-x86_64-linux-gnu as x86_64-linux-gnu -FROM --platform=linux/arm64 ghcr.io/kong/kong-openssl:1.1.0-aarch64-linux-musl as aarch64-linux-musl -FROM --platform=linux/arm64 ghcr.io/kong/kong-openssl:1.1.0-aarch64-linux-gnu as aarch64-linux-gnu +FROM --platform=linux/amd64 ghcr.io/kong/kong-openssl:1.1.3-x86_64-linux-musl as x86_64-linux-musl +FROM --platform=linux/amd64 ghcr.io/kong/kong-openssl:1.1.3-x86_64-linux-gnu as x86_64-linux-gnu +FROM --platform=linux/arm64 ghcr.io/kong/kong-openssl:1.1.3-aarch64-linux-musl as aarch64-linux-musl +FROM --platform=linux/arm64 ghcr.io/kong/kong-openssl:1.1.3-aarch64-linux-gnu as aarch64-linux-gnu # Run the build script diff --git a/test.sh b/test.sh index edc6d84..b5cc6be 100755 --- a/test.sh +++ b/test.sh @@ -12,7 +12,8 @@ export $(grep -v '^#' $SCRIPT_DIR/.env | xargs) function test() { cp -R /tmp/build/* / - /usr/local/kong/bin/openssl version # From kong-openssl test.sh + /usr/local/kong/bin/openssl version # From kong-openssl test.sh + ls -la /usr/local/kong/lib/libyaml.so # From kong-openssl test.sh /usr/local/openresty/bin/openresty -v 2>&1 | grep -q ${OPENRESTY_VERSION} /usr/local/openresty/bin/openresty -V 2>&1 | grep -q pcre