From c8cc93e0d8bcf41729a330fb718f05b99d41557a Mon Sep 17 00:00:00 2001 From: Steven Noble Date: Mon, 24 Apr 2017 13:21:16 -0700 Subject: [PATCH 1/3] Update builder8 to v1.6 with support for building FRR --- docker/images/builder8/1.6/Dockerfile | 20 ++++++++++++++++++++ docker/images/builder8/1.6/Makefile | 19 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 docker/images/builder8/1.6/Dockerfile create mode 100644 docker/images/builder8/1.6/Makefile diff --git a/docker/images/builder8/1.6/Dockerfile b/docker/images/builder8/1.6/Dockerfile new file mode 100644 index 00000000..b166f6d0 --- /dev/null +++ b/docker/images/builder8/1.6/Dockerfile @@ -0,0 +1,20 @@ +############################################################ +# +# Update with FRR support dependencies. +# +############################################################ +FROM opennetworklinux/builder8:1.5 +MAINTAINER Jeffrey Townsend + +RUN apt-get update && apt-get install -y \ +libreadline-dev texinfo libjson-c-dev pkg-config flex \ +python-pip libc-ares-dev python3-dev texlive-latex-base \ +texlive-generic-recommended libpam0g-dev libpam0g-dev \ +libcap-dev hardening-wrapper libpcre3-dev chrpath \ +dh-autoreconf libjson0 libjson0-dev dh-systemd \ +libsystemd-dev python-ipaddr groff devscripts + +# Docker shell and other container tools. +# +COPY docker_shell /bin/docker_shell +COPY container-id /bin/container-id diff --git a/docker/images/builder8/1.6/Makefile b/docker/images/builder8/1.6/Makefile new file mode 100644 index 00000000..1177e2ad --- /dev/null +++ b/docker/images/builder8/1.6/Makefile @@ -0,0 +1,19 @@ +VERSION=1.6 +USER=opennetworklinux +REPO=builder8 + +TOOLS=../../../tools/docker_shell ../../../tools/container-id + +build: check_version + cp $(TOOLS) . + docker build -t $(USER)/$(REPO):$(VERSION) . + rm -rf $(notdir $(TOOLS)) + +# +# Todo: Query remote repository to see if the request version already exists to avoid accidental overwrites +# when a new image is built but the VERSION variable is not updated. +# +check_version: + +push: + docker push $(USER)/$(REPO):$(VERSION) From 7ed737cd94b5050c739f57e38a5c15df143f4d12 Mon Sep 17 00:00:00 2001 From: Steven Noble Date: Wed, 26 Apr 2017 15:35:14 -0700 Subject: [PATCH 2/3] Added cross packages for powerpc, armel and aarch64 --- docker/images/builder8/1.6/Dockerfile | 29 +++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/docker/images/builder8/1.6/Dockerfile b/docker/images/builder8/1.6/Dockerfile index b166f6d0..a9bab2ac 100644 --- a/docker/images/builder8/1.6/Dockerfile +++ b/docker/images/builder8/1.6/Dockerfile @@ -7,12 +7,29 @@ FROM opennetworklinux/builder8:1.5 MAINTAINER Jeffrey Townsend RUN apt-get update && apt-get install -y \ -libreadline-dev texinfo libjson-c-dev pkg-config flex \ -python-pip libc-ares-dev python3-dev texlive-latex-base \ -texlive-generic-recommended libpam0g-dev libpam0g-dev \ -libcap-dev hardening-wrapper libpcre3-dev chrpath \ -dh-autoreconf libjson0 libjson0-dev dh-systemd \ -libsystemd-dev python-ipaddr groff devscripts +chrpath devscripts dh-autoreconf dh-systemd flex \ +hardening-wrapper libcap-dev libc-ares-dev libjson0 \ +libjson0-dev libjson-c-dev libpam0g-dev libpcre3-dev \ +libreadline-dev libsystemd-dev pkg-config \ +texlive-generic-recommended texinfo texlive-latex-base + +RUN xapt -a powerpc chrpath hardening-wrapper \ +libcap-dev libc-ares-dev libjson0 libjson0-dev \ +libjson-c-dev libpam0g-dev libpcre3-dev libreadline-dev \ +libsystemd-dev pkg-config texinfo libreadline6-dev \ +libtext-unidecode-perl libintl-perl libxml-libxml-perl + +RUN xapt -a arm64 chrpath groff hardening-wrapper \ +libcap-dev libc-ares-dev libjson0 libjson0-dev \ +libjson-c-dev libpam0g-dev libpcre3-dev libreadline-dev \ +libsystemd-dev pkg-config texinfo libreadline6-dev \ +libintl-perl libxml-libxml-perl + +RUN xapt -a armel chrpath groff hardening-wrapper \ +libcap-dev libc-ares-dev libjson0 libjson0-dev \ +libjson-c-dev libpam0g-dev libpcre3-dev libreadline-dev \ +libsystemd-dev pkg-config texinfo libreadline6-dev \ +libintl-perl libxml-libxml-perl # Docker shell and other container tools. # From 64f29cd3b73cff486528dc69431ab38d332a053d Mon Sep 17 00:00:00 2001 From: Steven Noble Date: Wed, 26 Apr 2017 15:44:59 -0700 Subject: [PATCH 3/3] remove groff, no longer necessary --- docker/images/builder8/1.6/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/images/builder8/1.6/Dockerfile b/docker/images/builder8/1.6/Dockerfile index a9bab2ac..193be33a 100644 --- a/docker/images/builder8/1.6/Dockerfile +++ b/docker/images/builder8/1.6/Dockerfile @@ -19,13 +19,13 @@ libjson-c-dev libpam0g-dev libpcre3-dev libreadline-dev \ libsystemd-dev pkg-config texinfo libreadline6-dev \ libtext-unidecode-perl libintl-perl libxml-libxml-perl -RUN xapt -a arm64 chrpath groff hardening-wrapper \ +RUN xapt -a arm64 chrpath hardening-wrapper \ libcap-dev libc-ares-dev libjson0 libjson0-dev \ libjson-c-dev libpam0g-dev libpcre3-dev libreadline-dev \ libsystemd-dev pkg-config texinfo libreadline6-dev \ libintl-perl libxml-libxml-perl -RUN xapt -a armel chrpath groff hardening-wrapper \ +RUN xapt -a armel chrpath hardening-wrapper \ libcap-dev libc-ares-dev libjson0 libjson0-dev \ libjson-c-dev libpam0g-dev libpcre3-dev libreadline-dev \ libsystemd-dev pkg-config texinfo libreadline6-dev \