From 4958768ba7812ba10a49d594be49f1dbb75f1542 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 21 Sep 2024 20:02:00 -0400 Subject: [PATCH 1/2] feat: upgrade builder docker image to Ubuntu Noble --- contrib/build-base.Dockerfile | 4 +--- contrib/build-dokku.Dockerfile | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/contrib/build-base.Dockerfile b/contrib/build-base.Dockerfile index 2c6ff629f..1b3cd3535 100644 --- a/contrib/build-base.Dockerfile +++ b/contrib/build-base.Dockerfile @@ -1,8 +1,6 @@ -FROM ubuntu:20.04 +FROM ubuntu:24.04 ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update -qq && apt-get -qq -y --no-install-recommends install ca-certificates curl gcc git jq build-essential wget ruby-dev lintian python3 rpm help2man man-db sudo -RUN curl -sL -o /usr/local/share/ca-certificates/GlobalSignRootCA_R3.crt https://raw.githubusercontent.com/rubygems/rubygems/master/lib/rubygems/ssl_certs/rubygems.org/GlobalSignRootCA_R3.pem -RUN update-ca-certificates RUN command -v fpm || gem install fpm diff --git a/contrib/build-dokku.Dockerfile b/contrib/build-dokku.Dockerfile index 04342fc45..4c596958e 100644 --- a/contrib/build-dokku.Dockerfile +++ b/contrib/build-dokku.Dockerfile @@ -1,4 +1,4 @@ -FROM dokku/build-base:0.1.2 AS builder +FROM dokku/build-base:0.2.0 AS builder ENV DEBIAN_FRONTEND=noninteractive From 087f0e35a0c5a1277b6161103d796e2c53e7314d Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 21 Sep 2024 23:04:39 -0400 Subject: [PATCH 2/2] fix: ensure dependencies for sshcommand are available for the build process --- contrib/build-base.Dockerfile | 20 +++++++++++++++++++- contrib/build-dokku.Dockerfile | 2 +- deb.mk | 2 +- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/contrib/build-base.Dockerfile b/contrib/build-base.Dockerfile index 1b3cd3535..17259793f 100644 --- a/contrib/build-base.Dockerfile +++ b/contrib/build-base.Dockerfile @@ -2,5 +2,23 @@ FROM ubuntu:24.04 ENV DEBIAN_FRONTEND=noninteractive -RUN apt-get update -qq && apt-get -qq -y --no-install-recommends install ca-certificates curl gcc git jq build-essential wget ruby-dev lintian python3 rpm help2man man-db sudo +RUN apt-get update -qq && apt-get -qq -y --no-install-recommends install \ + adduser \ + build-essential \ + ca-certificates \ + coreutils \ + curl \ + gcc \ + git \ + help2man \ + jq \ + libc-bin \ + lintian \ + man-db \ + openssh-client \ + python3 \ + rpm \ + ruby-dev \ + sudo \ + wget RUN command -v fpm || gem install fpm diff --git a/contrib/build-dokku.Dockerfile b/contrib/build-dokku.Dockerfile index 4c596958e..0bb514c75 100644 --- a/contrib/build-dokku.Dockerfile +++ b/contrib/build-dokku.Dockerfile @@ -1,4 +1,4 @@ -FROM dokku/build-base:0.2.0 AS builder +FROM dokku/build-base:0.2.1 AS builder ENV DEBIAN_FRONTEND=noninteractive diff --git a/deb.mk b/deb.mk index 546a98c3f..528c0177e 100644 --- a/deb.mk +++ b/deb.mk @@ -27,7 +27,7 @@ deb-all: deb-setup deb-dokku deb-setup: @echo "-> Updating deb repository and installing build requirements" @sudo apt-get update -qq >/dev/null - @sudo DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get -qq -y --no-install-recommends install gcc git build-essential wget ruby-dev ruby1.9.1 lintian >/dev/null 2>&1 + @sudo DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get -qq -y --no-install-recommends install gcc git build-essential wget ruby-dev lintian >/dev/null 2>&1 @command -v fpm >/dev/null || sudo gem install fpm --no-ri --no-rdoc @ssh -o StrictHostKeyChecking=no git@github.com || true