From 1a1590c29932387888bb29b1f3c2724891b81477 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 14 Feb 2023 01:14:10 -0500 Subject: [PATCH 1/3] fix: update build-base docker image to ensure we can build on all supported platforms without stalling The image can now be built via: docker buildx build --platform linux/arm,linux/arm64,linux/amd64 --progress plain --push --tag dokku/build-base:latest --tag dokku/build-base:0.0.1 -f contrib/build-base.Dockerfile . --- contrib/build-base.Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/build-base.Dockerfile b/contrib/build-base.Dockerfile index e36bf9d90..64d0e1856 100644 --- a/contrib/build-base.Dockerfile +++ b/contrib/build-base.Dockerfile @@ -2,5 +2,7 @@ FROM ubuntu:20.04 ENV DEBIAN_FRONTEND=noninteractive -RUN apt-get update -qq && apt-get -qq -y --no-install-recommends install gcc git build-essential wget ruby-dev ruby1.9.1 lintian rpm help2man man-db -RUN command -v fpm >/dev/null || sudo gem install fpm --no-ri --no-rdoc +RUN apt-get update -qq && apt-get -qq -y --no-install-recommends install ca-certificates curl gcc git build-essential wget ruby-dev lintian rpm help2man man-db +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 From 86509779180b84412740da1a1bdd54fe68166743 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 14 Feb 2023 01:16:06 -0500 Subject: [PATCH 2/3] chore: drop already installed packages These are installed in the base image. --- contrib/build-dokku.Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/contrib/build-dokku.Dockerfile b/contrib/build-dokku.Dockerfile index 3de8a3178..fef77c766 100644 --- a/contrib/build-dokku.Dockerfile +++ b/contrib/build-dokku.Dockerfile @@ -2,9 +2,6 @@ FROM dokku/build-base:0.0.1 AS builder ENV DEBIAN_FRONTEND=noninteractive -RUN apt-get update -qq && apt-get -qq -y --no-install-recommends install gcc git build-essential wget ruby-dev ruby1.9.1 lintian rpm help2man man-db -RUN command -v fpm >/dev/null || sudo gem install fpm --no-ri --no-rdoc - ARG GOLANG_VERSION RUN wget -qO /tmp/go${GOLANG_VERSION}.linux.tar.gz "https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-$(dpkg --print-architecture).tar.gz" \ From b5b50ace5ea276b8c39bb5ff0f3bdc604300e483 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 14 Feb 2023 01:16:42 -0500 Subject: [PATCH 3/3] fix: install sudo --- contrib/build-base.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/build-base.Dockerfile b/contrib/build-base.Dockerfile index 64d0e1856..e6394e64a 100644 --- a/contrib/build-base.Dockerfile +++ b/contrib/build-base.Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:20.04 ENV DEBIAN_FRONTEND=noninteractive -RUN apt-get update -qq && apt-get -qq -y --no-install-recommends install ca-certificates curl gcc git build-essential wget ruby-dev lintian rpm help2man man-db +RUN apt-get update -qq && apt-get -qq -y --no-install-recommends install ca-certificates curl gcc git build-essential wget ruby-dev lintian 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