From f5c45b99ad5685983388ef693c5606534ce2b103 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 21 Jan 2019 21:53:35 -0500 Subject: [PATCH] refactor: use a base image when running the build process in CI --- contrib/build-base.Dockerfile | 6 ++++++ contrib/build-dokku-update.Dockerfile | 2 +- contrib/build-dokku.Dockerfile | 6 +++--- contrib/build-herokuish.Dockerfile | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 contrib/build-base.Dockerfile diff --git a/contrib/build-base.Dockerfile b/contrib/build-base.Dockerfile new file mode 100644 index 000000000..a7f7f141e --- /dev/null +++ b/contrib/build-base.Dockerfile @@ -0,0 +1,6 @@ +FROM ubuntu:14.04 + +ENV DEBIAN_FRONTEND=noninteractive + +RUN apt-get update && apt-get -y 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 diff --git a/contrib/build-dokku-update.Dockerfile b/contrib/build-dokku-update.Dockerfile index dde97653f..193ce217b 100644 --- a/contrib/build-dokku-update.Dockerfile +++ b/contrib/build-dokku-update.Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:14.04 +FROM dokku/build-base:0.0.1 ENV DEBIAN_FRONTEND=noninteractive diff --git a/contrib/build-dokku.Dockerfile b/contrib/build-dokku.Dockerfile index df9452e69..94e286f5e 100644 --- a/contrib/build-dokku.Dockerfile +++ b/contrib/build-dokku.Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:14.04 +FROM dokku/build-base:0.0.1 ENV DEBIAN_FRONTEND=noninteractive @@ -36,7 +36,7 @@ RUN PLUGIN_MAKE_TARGET=${PLUGIN_MAKE_TARGET} \ SKIP_GO_CLEAN=true \ make version copyfiles \ && rm -rf plugins/common/*.go plugins/common/glide* plugins/common/vendor/ \ - && make deb-herokuish deb-dokku deb-plugn deb-sshcommand deb-sigil deb-dokku-update \ - rpm-herokuish rpm-dokku rpm-plugn rpm-sshcommand rpm-sigil rpm-dokku-update + && make deb-dokku deb-plugn deb-sshcommand deb-sigil \ + rpm-dokku rpm-plugn rpm-sshcommand rpm-sigil RUN ls -lha /tmp/ diff --git a/contrib/build-herokuish.Dockerfile b/contrib/build-herokuish.Dockerfile index 3aaf33cad..5375f9c87 100644 --- a/contrib/build-herokuish.Dockerfile +++ b/contrib/build-herokuish.Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:14.04 +FROM dokku/build-base:0.0.1 ENV DEBIAN_FRONTEND=noninteractive