From 36b033542137e4445b6f94c62156c5a941b10745 Mon Sep 17 00:00:00 2001 From: Aapo Talvensaari Date: Tue, 21 Apr 2020 00:28:23 +0300 Subject: [PATCH] chore(docker) bump libyaml from 0.2.1 to 0.2.3 (#262) ### Summary #### libyaml 0.2.2 release - #95 -- build: do not install config.h - #97 -- appveyor.yml: fix Release build - #103 -- Remove unused code in yaml_document_delete - #104 -- Allow colons in plain scalars inside flow collections - #109 -- Fix comparison in tests/run-emitter.c - #117 -- Fix typo error - #119 -- The closing single quote needs to be indented... - #121 -- fix token name typos in comments - #122 -- Revert removing of open_ended after top level plain scalar - #125 -- Cherry-picks from PR 27 - #135 -- Windows/C89 compatibility - #136 -- allow override of Windows static lib name #### libyaml 0.2.3 release - #130 Fixed typo. - #144 Fix typo in comment - #140 Use pointer to const for strings that aren't/shouldn't be modified - #128 Squash a couple of warnings in example-deconstructor-alt - #151 Fix spelling for error message - #161 Make appveyor config be a hidden file - #159 Add CHANGES file - #160 Always output document end before directive (YAML 1.2 compatibility) - #162 Output document end marker after open ended scalars - #157 change cmake target name from libOFF.a to libyaml.a - #155 include/yaml.h: fix comments - #169 Fixed missing token in example - #127 Avoid recursion in the document loader. - #172 Support %YAML 1.2 directives - #66 Change dllexport controlling macro to use _WIN32 --- Makefile | 4 ++-- dockerfiles/Dockerfile.openresty | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 9fcd57ea440..7772afea18e 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,7 @@ RESTY_PCRE_VERSION ?= `grep RESTY_PCRE_VERSION $(KONG_SOURCE_LOCATION)/.requirem KONG_GMP_VERSION ?= `grep KONG_GMP_VERSION $(KONG_SOURCE_LOCATION)/.requirements | awk -F"=" '{print $$2}'` KONG_NETTLE_VERSION ?= `grep KONG_NETTLE_VERSION $(KONG_SOURCE_LOCATION)/.requirements | awk -F"=" '{print $$2}'` OPENRESTY_PATCHES ?= 1 -LIBYAML_VERSION ?= 0.2.1 +LIBYAML_VERSION ?= 0.2.3 DOCKER_KONG_VERSION ?= master DEBUG ?= 0 @@ -278,7 +278,7 @@ ifneq ($(RESTY_IMAGE_BASE),src) -t $(DOCKER_REPOSITORY):test-$(DOCKER_TEST_SUFFIX) . docker tag $(DOCKER_REPOSITORY):test-$(DOCKER_TEST_SUFFIX) $(DOCKER_REPOSITORY):test docker tag $(DOCKER_REPOSITORY):test-$(DOCKER_TEST_SUFFIX) $(DOCKER_REPOSITORY):test-$(DOCKER_OPENRESTY_SUFFIX) - + -$(UPDATE_CACHE_COMMAND) $(DOCKER_REPOSITORY):test-$(DOCKER_OPENRESTY_SUFFIX) endif diff --git a/dockerfiles/Dockerfile.openresty b/dockerfiles/Dockerfile.openresty index e1cdb654f4b..f574bf19a0f 100644 --- a/dockerfiles/Dockerfile.openresty +++ b/dockerfiles/Dockerfile.openresty @@ -8,7 +8,7 @@ FROM ${DOCKER_REPOSITORY}:${RESTY_IMAGE_BASE}-${RESTY_IMAGE_TAG}-${DOCKER_BASE_S ARG EDITION="community" ENV EDITION $EDITION -ARG LIBYAML_VERSION=0.2.1 +ARG LIBYAML_VERSION=0.2.3 ENV LIBYAML_VERSION $LIBYAML_VERSION RUN curl -fsSLo /tmp/yaml-${LIBYAML_VERSION}.tar.gz https://pyyaml.org/download/libyaml/yaml-${LIBYAML_VERSION}.tar.gz \ && cd /tmp \