From 2604f69c7e6762395d900fc63f162e49e417bdc6 Mon Sep 17 00:00:00 2001 From: Lisandro Pin Date: Wed, 8 May 2024 17:59:42 +0200 Subject: [PATCH 1/2] Fix build targets for packages. RoR gem dependencies for these were unversioned, which broke package generation as releases moved forward. They're all now pinned to compatible versions for each distro. --- docker/build/build-centos7/Dockerfile | 1 + docker/build/build-centos8/Dockerfile | 7 +++++-- docker/build/build-debian10/Dockerfile | 5 +++-- docker/build/build-debian11/Dockerfile | 5 +++-- docker/build/build-debian9/Dockerfile | 5 +++-- docker/build/build-ubuntu16/Dockerfile | 1 + docker/build/build-ubuntu18/Dockerfile | 5 +++-- docker/build/build-ubuntu20/Dockerfile | 5 +++-- 8 files changed, 22 insertions(+), 12 deletions(-) diff --git a/docker/build/build-centos7/Dockerfile b/docker/build/build-centos7/Dockerfile index 8d0820f..737a59a 100644 --- a/docker/build/build-centos7/Dockerfile +++ b/docker/build/build-centos7/Dockerfile @@ -16,6 +16,7 @@ RUN yum update -y && \ # fpm packaging RUN yum install -y ruby rubygems ruby-devel && \ + gem install --no-ri --no-rdoc dotenv -v '2.8.1' && \ gem install --no-ri --no-rdoc ffi -v '1.9.14' && \ gem install --no-ri --no-rdoc git -v '1.6' && \ gem install --no-ri --no-rdoc fpm -v '1.11.0' diff --git a/docker/build/build-centos8/Dockerfile b/docker/build/build-centos8/Dockerfile index b17cdff..aba10f1 100644 --- a/docker/build/build-centos8/Dockerfile +++ b/docker/build/build-centos8/Dockerfile @@ -15,6 +15,9 @@ RUN yum update -y && \ wget -q -O /usr/include/mysql/hash.h https://raw.githubusercontent.com/mysql/mysql-server/5.7/include/hash.h # fpm packaging +RUN dnf module -y enable ruby:3.0 RUN yum install -y ruby rubygems ruby-devel && \ - gem install ffi && \ - gem install fpm + gem install --no-document dotenv -v '2.8.1' && \ + gem install --no-document rexml -v '3.2.6' && \ + gem install --no-document ffi -v '1.9.14' && \ + gem install --no-document fpm -v '1.11.0' diff --git a/docker/build/build-debian10/Dockerfile b/docker/build/build-debian10/Dockerfile index 001245d..8d94f39 100644 --- a/docker/build/build-debian10/Dockerfile +++ b/docker/build/build-debian10/Dockerfile @@ -17,5 +17,6 @@ RUN apt-get -y update && \ # fpm packaging RUN apt-get -y install ruby ruby-dev && \ - gem install ffi && \ - gem install fpm + gem install --no-ri --no-rdoc dotenv -v '2.8.1' && \ + gem install --no-ri --no-rdoc ffi -v '1.9.14' && \ + gem install --no-ri --no-rdoc fpm -v '1.11.0' diff --git a/docker/build/build-debian11/Dockerfile b/docker/build/build-debian11/Dockerfile index 11f1f8e..51c310c 100644 --- a/docker/build/build-debian11/Dockerfile +++ b/docker/build/build-debian11/Dockerfile @@ -17,5 +17,6 @@ RUN apt-get -y update && \ # fpm packaging RUN apt-get -y install ruby ruby-dev && \ - gem install ffi && \ - gem install fpm + gem install --no-document dotenv -v '2.8.1' && \ + gem install --no-document ffi -v '1.9.14' && \ + gem install --no-document fpm -v '1.11.0' diff --git a/docker/build/build-debian9/Dockerfile b/docker/build/build-debian9/Dockerfile index 90084e8..e6feb2d 100644 --- a/docker/build/build-debian9/Dockerfile +++ b/docker/build/build-debian9/Dockerfile @@ -17,5 +17,6 @@ RUN apt-get -y update && \ # fpm packaging RUN apt-get -y install ruby ruby-dev && \ - gem install ffi && \ - gem install fpm + gem install --no-ri --no-rdoc dotenv -v '2.8.1' && \ + gem install --no-ri --no-rdoc ffi -v '1.9.14' && \ + gem install --no-ri --no-rdoc fpm -v '1.11.0' diff --git a/docker/build/build-ubuntu16/Dockerfile b/docker/build/build-ubuntu16/Dockerfile index 4c076e9..82cec4d 100644 --- a/docker/build/build-ubuntu16/Dockerfile +++ b/docker/build/build-ubuntu16/Dockerfile @@ -8,5 +8,6 @@ RUN git config --system --add safe.directory /opt/ # fpm packaging RUN apt-get -y update && \ apt-get -y install ruby ruby-dev && \ + gem install --no-ri --no-rdoc dotenv -v '2.8.1' && \ gem install --no-ri --no-rdoc ffi -v '1.9.14' && \ gem install --no-ri --no-rdoc fpm -v '1.11.0' diff --git a/docker/build/build-ubuntu18/Dockerfile b/docker/build/build-ubuntu18/Dockerfile index 01fb39a..9b1540f 100644 --- a/docker/build/build-ubuntu18/Dockerfile +++ b/docker/build/build-ubuntu18/Dockerfile @@ -8,5 +8,6 @@ RUN git config --system --add safe.directory /opt/ # fpm packaging RUN apt-get -y update && \ apt-get -y install ruby ruby-dev && \ - gem install ffi && \ - gem install fpm + gem install --no-ri --no-rdoc dotenv -v '2.8.1' && \ + gem install --no-ri --no-rdoc ffi -v '1.9.14' && \ + gem install --no-ri --no-rdoc fpm -v '1.11.0' diff --git a/docker/build/build-ubuntu20/Dockerfile b/docker/build/build-ubuntu20/Dockerfile index afab4d7..574c3bd 100644 --- a/docker/build/build-ubuntu20/Dockerfile +++ b/docker/build/build-ubuntu20/Dockerfile @@ -17,5 +17,6 @@ RUN apt-get -y update && \ # fpm packaging RUN apt-get -y install ruby ruby-dev && \ - gem install ffi && \ - gem install fpm + gem install --no-document dotenv -v '2.8.1' && \ + gem install --no-document ffi -v '1.9.14' && \ + gem install --no-document fpm -v '1.11.0' From d069cdf9cb1f59437d67c5d2ff734748723837cf Mon Sep 17 00:00:00 2001 From: Lisandro Pin Date: Tue, 18 Jun 2024 17:47:02 +0200 Subject: [PATCH 2/2] More build target fixes: - Bump FPM to v1.12.0; the previous verision lacked (required) dependencies on zlib. - Add libboost dependencies for older Ubuntu releases. 2604f6. --- docker/build/build-centos7/Dockerfile | 2 +- docker/build/build-centos8/Dockerfile | 2 +- docker/build/build-debian10/Dockerfile | 2 +- docker/build/build-debian11/Dockerfile | 2 +- docker/build/build-debian9/Dockerfile | 2 +- docker/build/build-ubuntu16/Dockerfile | 9 ++++++--- docker/build/build-ubuntu18/Dockerfile | 9 ++++++--- docker/build/build-ubuntu20/Dockerfile | 2 +- 8 files changed, 18 insertions(+), 12 deletions(-) diff --git a/docker/build/build-centos7/Dockerfile b/docker/build/build-centos7/Dockerfile index 737a59a..c1e2c44 100644 --- a/docker/build/build-centos7/Dockerfile +++ b/docker/build/build-centos7/Dockerfile @@ -19,4 +19,4 @@ RUN yum install -y ruby rubygems ruby-devel && \ gem install --no-ri --no-rdoc dotenv -v '2.8.1' && \ gem install --no-ri --no-rdoc ffi -v '1.9.14' && \ gem install --no-ri --no-rdoc git -v '1.6' && \ - gem install --no-ri --no-rdoc fpm -v '1.11.0' + gem install --no-ri --no-rdoc fpm -v '1.12.0' diff --git a/docker/build/build-centos8/Dockerfile b/docker/build/build-centos8/Dockerfile index aba10f1..baf5398 100644 --- a/docker/build/build-centos8/Dockerfile +++ b/docker/build/build-centos8/Dockerfile @@ -20,4 +20,4 @@ RUN yum install -y ruby rubygems ruby-devel && \ gem install --no-document dotenv -v '2.8.1' && \ gem install --no-document rexml -v '3.2.6' && \ gem install --no-document ffi -v '1.9.14' && \ - gem install --no-document fpm -v '1.11.0' + gem install --no-document fpm -v '1.12.0' diff --git a/docker/build/build-debian10/Dockerfile b/docker/build/build-debian10/Dockerfile index 8d94f39..ed19083 100644 --- a/docker/build/build-debian10/Dockerfile +++ b/docker/build/build-debian10/Dockerfile @@ -19,4 +19,4 @@ RUN apt-get -y update && \ RUN apt-get -y install ruby ruby-dev && \ gem install --no-ri --no-rdoc dotenv -v '2.8.1' && \ gem install --no-ri --no-rdoc ffi -v '1.9.14' && \ - gem install --no-ri --no-rdoc fpm -v '1.11.0' + gem install --no-ri --no-rdoc fpm -v '1.12.0' diff --git a/docker/build/build-debian11/Dockerfile b/docker/build/build-debian11/Dockerfile index 51c310c..1a6c14e 100644 --- a/docker/build/build-debian11/Dockerfile +++ b/docker/build/build-debian11/Dockerfile @@ -19,4 +19,4 @@ RUN apt-get -y update && \ RUN apt-get -y install ruby ruby-dev && \ gem install --no-document dotenv -v '2.8.1' && \ gem install --no-document ffi -v '1.9.14' && \ - gem install --no-document fpm -v '1.11.0' + gem install --no-document fpm -v '1.12.0' diff --git a/docker/build/build-debian9/Dockerfile b/docker/build/build-debian9/Dockerfile index e6feb2d..47f2fb3 100644 --- a/docker/build/build-debian9/Dockerfile +++ b/docker/build/build-debian9/Dockerfile @@ -19,4 +19,4 @@ RUN apt-get -y update && \ RUN apt-get -y install ruby ruby-dev && \ gem install --no-ri --no-rdoc dotenv -v '2.8.1' && \ gem install --no-ri --no-rdoc ffi -v '1.9.14' && \ - gem install --no-ri --no-rdoc fpm -v '1.11.0' + gem install --no-ri --no-rdoc fpm -v '1.12.0' diff --git a/docker/build/build-ubuntu16/Dockerfile b/docker/build/build-ubuntu16/Dockerfile index 82cec4d..151b7c1 100644 --- a/docker/build/build-ubuntu16/Dockerfile +++ b/docker/build/build-ubuntu16/Dockerfile @@ -5,9 +5,12 @@ MAINTAINER Miro Stauder # set git safe dir RUN git config --system --add safe.directory /opt/ -# fpm packaging +# build dependencies RUN apt-get -y update && \ - apt-get -y install ruby ruby-dev && \ + apt-get -y install libboost-all-dev + +# fpm packaging +RUN apt-get -y install ruby ruby-dev && \ gem install --no-ri --no-rdoc dotenv -v '2.8.1' && \ gem install --no-ri --no-rdoc ffi -v '1.9.14' && \ - gem install --no-ri --no-rdoc fpm -v '1.11.0' + gem install --no-ri --no-rdoc fpm -v '1.12.0' diff --git a/docker/build/build-ubuntu18/Dockerfile b/docker/build/build-ubuntu18/Dockerfile index 9b1540f..95fd293 100644 --- a/docker/build/build-ubuntu18/Dockerfile +++ b/docker/build/build-ubuntu18/Dockerfile @@ -5,9 +5,12 @@ MAINTAINER Miro Stauder # set git safe dir RUN git config --system --add safe.directory /opt/ -# fpm packaging +# build dependencies RUN apt-get -y update && \ - apt-get -y install ruby ruby-dev && \ + apt-get -y install libboost-all-dev + +# fpm packaging +RUN apt-get -y install ruby ruby-dev && \ gem install --no-ri --no-rdoc dotenv -v '2.8.1' && \ gem install --no-ri --no-rdoc ffi -v '1.9.14' && \ - gem install --no-ri --no-rdoc fpm -v '1.11.0' + gem install --no-ri --no-rdoc fpm -v '1.12.0' diff --git a/docker/build/build-ubuntu20/Dockerfile b/docker/build/build-ubuntu20/Dockerfile index 574c3bd..a36d390 100644 --- a/docker/build/build-ubuntu20/Dockerfile +++ b/docker/build/build-ubuntu20/Dockerfile @@ -19,4 +19,4 @@ RUN apt-get -y update && \ RUN apt-get -y install ruby ruby-dev && \ gem install --no-document dotenv -v '2.8.1' && \ gem install --no-document ffi -v '1.9.14' && \ - gem install --no-document fpm -v '1.11.0' + gem install --no-document fpm -v '1.12.0'