From e9ac2a8c9aedb582d531e433a778b367fb7b9940 Mon Sep 17 00:00:00 2001 From: Jeffrey Townsend Date: Mon, 31 Dec 2018 09:45:16 -0800 Subject: [PATCH] Minor updates for running builds under stretch. --- docker/images/builder8/1.10/Dockerfile | 12 ++++++++++++ docker/images/builder8/1.10/Makefile | 19 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 docker/images/builder8/1.10/Dockerfile create mode 100644 docker/images/builder8/1.10/Makefile diff --git a/docker/images/builder8/1.10/Dockerfile b/docker/images/builder8/1.10/Dockerfile new file mode 100644 index 00000000..d729e076 --- /dev/null +++ b/docker/images/builder8/1.10/Dockerfile @@ -0,0 +1,12 @@ +FROM opennetworklinux/builder8:1.9 +MAINTAINER Jeffrey Townsend + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \ + apt-get install linux-perf-4.9 linux-tools-3.16 linux-tools -y + +# +# 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.10/Makefile b/docker/images/builder8/1.10/Makefile new file mode 100644 index 00000000..0e19100f --- /dev/null +++ b/docker/images/builder8/1.10/Makefile @@ -0,0 +1,19 @@ +VERSION=1.10 +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)