From f1979a3ec0988d645fd7b20dff452bdd58b0895c Mon Sep 17 00:00:00 2001 From: Isa Farnik Date: Fri, 23 Dec 2022 14:22:56 -0800 Subject: [PATCH] fix(fpm): add patch for apk See also: https://github.com/jordansissel/fpm/issues/1227 --- Dockerfile | 8 +++++++- patches/fpm-apk-archive-header.patch | 12 ++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 patches/fpm-apk-archive-header.patch diff --git a/Dockerfile b/Dockerfile index 0d60a35..a1701c1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,11 +10,17 @@ ENV DEBIAN_FRONTEND noninteractive SHELL ["/bin/bash", "-e", "-x", "-c"] +COPY patches/fpm-apk-archive-header.patch /tmp/fpm.patch + RUN if [[ "$FPM_VERSION" == 'latest' ]]; then \ gem install --no-document fpm; \ else \ gem install --no-document fpm -v "$FPM_VERSION"; \ - fi \ + fi + +# https://github.com/jordansissel/fpm/issues/1227 +RUN cd $(gem env gemhome)/gems/fpm-* \ + && patch -p 0 -ruN < /tmp/fpm.patch \ && mkdir -pv /src/ \ && fpm --version diff --git a/patches/fpm-apk-archive-header.patch b/patches/fpm-apk-archive-header.patch new file mode 100644 index 0000000..dbd1ab8 --- /dev/null +++ b/patches/fpm-apk-archive-header.patch @@ -0,0 +1,12 @@ +diff --color -Naur lib/fpm/package/apk.rb.orig lib/fpm/package/apk.rb +--- lib.orig/fpm/package/apk.rb 2022-12-23 14:03:55.583865965 -0800 ++++ lib/fpm/package/apk.rb 2022-12-23 14:06:56.040703096 -0800 +@@ -252,7 +252,7 @@ + + # directories have a magic string inserted into their name + full_record_path = extension_header[TAR_NAME_OFFSET_START..TAR_NAME_OFFSET_END].delete("\0") +- full_record_path = add_paxstring(full_record_path) ++ # full_record_path = add_paxstring(full_record_path) + + # hash data contents with sha1, if there is any content. + if(typeflag == '5')