Mirrors/dokku
1
0
Fork 0
mirror of https://github.com/dokku/dokku.git synced 2025-12-14 19:17:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: ensure dependencies for sshcommand are available for the build process

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2024-09-21 23:04:39 -04:00
parent 4958768ba7
commit 087f0e35a0
3 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
contrib/build-base.Dockerfile
View File

@@ -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

2
contrib/build-dokku.Dockerfile
View File

@@ -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

2
deb.mk
View File

@@ -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