diff --git a/docker/images/builder7/1.1/Dockerfile b/docker/images/builder7/1.1/Dockerfile new file mode 100644 index 00000000..e3813a49 --- /dev/null +++ b/docker/images/builder7/1.1/Dockerfile @@ -0,0 +1,12 @@ +FROM opennetworklinux/builder7:1.0 +MAINTAINER Rob Sherwood + +RUN apt-get update && apt-get install -y \ + libpcap-dev \ + telnet \ + gdb +# +# Docker shell and other container tools. +# +COPY docker_shell /bin/docker_shell +COPY container-id /bin/container-id diff --git a/docker/images/builder7/1.1/Makefile b/docker/images/builder7/1.1/Makefile new file mode 100644 index 00000000..df7a8449 --- /dev/null +++ b/docker/images/builder7/1.1/Makefile @@ -0,0 +1,20 @@ +VERSION=1.1 +USER=opennetworklinux +REPO=builder7 + +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) diff --git a/docker/images/builder8/1.1/Dockerfile b/docker/images/builder8/1.1/Dockerfile new file mode 100644 index 00000000..69fea361 --- /dev/null +++ b/docker/images/builder8/1.1/Dockerfile @@ -0,0 +1,12 @@ +FROM opennetworklinux/builder8:1.0 +MAINTAINER Rob Sherwood + +RUN apt-get update && apt-get install -y \ + libpcap-dev \ + telnet \ + gdb +# +# 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.1/Makefile b/docker/images/builder8/1.1/Makefile new file mode 100644 index 00000000..7b0835d2 --- /dev/null +++ b/docker/images/builder8/1.1/Makefile @@ -0,0 +1,19 @@ +VERSION=1.1 +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) diff --git a/docker/tools/onlbuilder b/docker/tools/onlbuilder index 04ec4ae4..1795fdfc 100755 --- a/docker/tools/onlbuilder +++ b/docker/tools/onlbuilder @@ -17,8 +17,8 @@ g_current_user = getpass.getuser() g_current_uid = os.getuid() g_timestamp = datetime.datetime.now().strftime("%Y-%m-%d.%H%M%S") -g_builder7_image_name="opennetworklinux/builder7:1.0" -g_builder8_image_name="opennetworklinux/builder8:1.0" +g_builder7_image_name="opennetworklinux/builder7:1.1" +g_builder8_image_name="opennetworklinux/builder8:1.1" g_default_image_name=g_builder7_image_name g_default_container_name = "%s_%s" % (g_current_user, g_timestamp)