From b12ec14f5556cababf2bee9909af0768c41feafb Mon Sep 17 00:00:00 2001 From: Antoine Jacquemin Date: Wed, 29 Mar 2023 16:52:35 +0200 Subject: [PATCH 1/4] Fix 3.2 changes --- customize/packer.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/customize/packer.lua b/customize/packer.lua index b84e1ee0..9f4e9c99 100644 --- a/customize/packer.lua +++ b/customize/packer.lua @@ -328,7 +328,9 @@ end header("Write new entry-point script") -assert(exec("mv /docker-entrypoint.sh /old-entrypoint.sh")) +exec("mv /docker-entrypoint.sh /old-entrypoint.sh"). -- for old version +exec("mv /entrypoint.sh /old-entrypoint.sh") -- for new version +assert(exec("ls /old-entrypoint.sh")) local entrypoint = [=[ #!/bin/sh set -e From ac4d21283474e260f0fcecb1e841a80e3569c26a Mon Sep 17 00:00:00 2001 From: Antoine Jacquemin Date: Wed, 29 Mar 2023 16:56:29 +0200 Subject: [PATCH 2/4] Update Dockerfile --- customize/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/customize/Dockerfile b/customize/Dockerfile index 5cb9fa41..776804bc 100644 --- a/customize/Dockerfile +++ b/customize/Dockerfile @@ -20,6 +20,7 @@ COPY packer.lua /packer.lua USER root +RUN cp /usr/local/lib/luarocks/rocks-5.1/luarocks/3.9.2-1/bin/luarocks-admin /usr/local/bin/ RUN /usr/local/openresty/luajit/bin/luajit /packer.lua -- "$INJECTED_PLUGINS" FROM ${KONG_BASE} From e076045b7f0b6e798c21b0db7722834c7f35048c Mon Sep 17 00:00:00 2001 From: Antoine Jacquemin Date: Wed, 29 Mar 2023 17:39:38 +0200 Subject: [PATCH 3/4] Update packer.lua --- customize/packer.lua | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/customize/packer.lua b/customize/packer.lua index 9f4e9c99..81850bcc 100644 --- a/customize/packer.lua +++ b/customize/packer.lua @@ -116,6 +116,10 @@ local function prep_platform() stderr("WARNING: no platform match!") end +local function file_exists(name) + local f = io.open(name, "r") + return f ~= nil and io.close(f) +end local function is_empty_file(filename) local t = readfile(filename) @@ -328,8 +332,12 @@ end header("Write new entry-point script") -exec("mv /docker-entrypoint.sh /old-entrypoint.sh"). -- for old version -exec("mv /entrypoint.sh /old-entrypoint.sh") -- for new version +if file_exists("/docker-entrypoint.sh") +then + assert(exec("mv /docker-entrypoint.sh /old-entrypoint.sh")) -- for old version +else + assert(exec("mv /entrypoint.sh /old-entrypoint.sh")) -- for new version +end assert(exec("ls /old-entrypoint.sh")) local entrypoint = [=[ #!/bin/sh From f4cd76d464588d410d8908292178c55fc3abee53 Mon Sep 17 00:00:00 2001 From: Antoine Jacquemin Date: Wed, 29 Mar 2023 17:40:15 +0200 Subject: [PATCH 4/4] Update packer.lua --- customize/packer.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/customize/packer.lua b/customize/packer.lua index 81850bcc..62b3b553 100644 --- a/customize/packer.lua +++ b/customize/packer.lua @@ -338,7 +338,6 @@ then else assert(exec("mv /entrypoint.sh /old-entrypoint.sh")) -- for new version end -assert(exec("ls /old-entrypoint.sh")) local entrypoint = [=[ #!/bin/sh set -e